X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=instrumentation%2Fevents%2Flttng-module%2Firq.h;h=6030790a132e72841fc7090c904105d3737ef71d;hb=360d3efee55154a55c18be32175bee608dcb21df;hp=e766326d214205f08b8b3af5d556e47265bc074a;hpb=3a523f5b6b4f8ca82412cb45f2d2ad9c44e7d249;p=lttng-modules.git diff --git a/instrumentation/events/lttng-module/irq.h b/instrumentation/events/lttng-module/irq.h index e766326d..6030790a 100644 --- a/instrumentation/events/lttng-module/irq.h +++ b/instrumentation/events/lttng-module/irq.h @@ -1,10 +1,10 @@ #undef TRACE_SYSTEM #define TRACE_SYSTEM irq -#if !defined(_TRACE_IRQ_H) || defined(TRACE_HEADER_MULTI_READ) -#define _TRACE_IRQ_H +#if !defined(LTTNG_TRACE_IRQ_H) || defined(TRACE_HEADER_MULTI_READ) +#define LTTNG_TRACE_IRQ_H -#include +#include #ifndef _TRACE_IRQ_DEF_ #define _TRACE_IRQ_DEF_ @@ -12,20 +12,6 @@ struct irqaction; struct softirq_action; -#define softirq_name(sirq) { sirq##_SOFTIRQ, #sirq } -#define show_softirq_name(val) \ - __print_symbolic(val, \ - softirq_name(HI), \ - softirq_name(TIMER), \ - softirq_name(NET_TX), \ - softirq_name(NET_RX), \ - softirq_name(BLOCK), \ - softirq_name(BLOCK_IOPOLL), \ - softirq_name(TASKLET), \ - softirq_name(SCHED), \ - softirq_name(HRTIMER), \ - softirq_name(RCU)) - #endif /* _TRACE_IRQ_DEF_ */ /** @@ -39,23 +25,16 @@ struct softirq_action; * conjunction with the irq_handler_exit tracepoint, we can figure * out irq handler latencies. */ -TRACE_EVENT(irq_handler_entry, +LTTNG_TRACEPOINT_EVENT(irq_handler_entry, TP_PROTO(int irq, struct irqaction *action), TP_ARGS(irq, action), - TP_STRUCT__entry( - __field( int, irq ) - __string( name, action->name ) - ), - - TP_fast_assign( - tp_assign(irq, irq) - tp_strcpy(name, action->name) - ), - - TP_printk("irq=%d name=%s", __entry->irq, __get_str(name)) + TP_FIELDS( + ctf_integer(int, irq, irq) + ctf_string(name, action->name) + ) ) /** @@ -69,43 +48,28 @@ TRACE_EVENT(irq_handler_entry, * a shared irq line, or the irq was not handled successfully. Can be used in * conjunction with the irq_handler_entry to understand irq handler latencies. */ -TRACE_EVENT(irq_handler_exit, +LTTNG_TRACEPOINT_EVENT(irq_handler_exit, TP_PROTO(int irq, struct irqaction *action, int ret), TP_ARGS(irq, action, ret), - TP_STRUCT__entry( - __field( int, irq ) - __field( int, ret ) - ), - - TP_fast_assign( - tp_assign(irq, irq) - tp_assign(ret, ret) - ), - - TP_printk("irq=%d ret=%s", - __entry->irq, __entry->ret ? "handled" : "unhandled") + TP_FIELDS( + ctf_integer(int, irq, irq) + ctf_integer(int, ret, ret) + ) ) -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) -DECLARE_EVENT_CLASS(softirq, +#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(2,6,37)) +LTTNG_TRACEPOINT_EVENT_CLASS(irq_softirq, TP_PROTO(unsigned int vec_nr), TP_ARGS(vec_nr), - TP_STRUCT__entry( - __field( unsigned int, vec ) - ), - - TP_fast_assign( - tp_assign(vec, vec_nr) - ), - - TP_printk("vec=%u [action=%s]", __entry->vec, - show_softirq_name(__entry->vec)) + TP_FIELDS( + ctf_integer(unsigned int, vec, vec_nr) + ) ) /** @@ -115,7 +79,9 @@ DECLARE_EVENT_CLASS(softirq, * When used in combination with the softirq_exit tracepoint * we can determine the softirq handler runtine. */ -DEFINE_EVENT(softirq, softirq_entry, +LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(irq_softirq, softirq_entry, + + irq_softirq_entry, TP_PROTO(unsigned int vec_nr), @@ -129,7 +95,9 @@ DEFINE_EVENT(softirq, softirq_entry, * When used in combination with the softirq_entry tracepoint * we can determine the softirq handler runtine. */ -DEFINE_EVENT(softirq, softirq_exit, +LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(irq_softirq, softirq_exit, + + irq_softirq_exit, TP_PROTO(unsigned int vec_nr), @@ -143,29 +111,24 @@ DEFINE_EVENT(softirq, softirq_exit, * When used in combination with the softirq_entry tracepoint * we can determine the softirq raise to run latency. */ -DEFINE_EVENT(softirq, softirq_raise, +LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(irq_softirq, softirq_raise, + + irq_softirq_raise, TP_PROTO(unsigned int vec_nr), TP_ARGS(vec_nr) ) -#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) */ -DECLARE_EVENT_CLASS(softirq, +#else /* #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(2,6,37)) */ +LTTNG_TRACEPOINT_EVENT_CLASS(irq_softirq, TP_PROTO(struct softirq_action *h, struct softirq_action *vec), TP_ARGS(h, vec), - TP_STRUCT__entry( - __field( unsigned int, vec ) - ), - - TP_fast_assign( - tp_assign(vec, (int)(h - vec)) - ), - - TP_printk("vec=%u [action=%s]", __entry->vec, - show_softirq_name(__entry->vec)) + TP_FIELDS( + ctf_integer(unsigned int, vec, (int)(h - vec)) + ) ) /** @@ -176,7 +139,9 @@ DECLARE_EVENT_CLASS(softirq, * When used in combination with the softirq_exit tracepoint * we can determine the softirq handler runtine. */ -DEFINE_EVENT(softirq, softirq_entry, +LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(irq_softirq, softirq_entry, + + irq_softirq_entry, TP_PROTO(struct softirq_action *h, struct softirq_action *vec), @@ -191,7 +156,9 @@ DEFINE_EVENT(softirq, softirq_entry, * When used in combination with the softirq_entry tracepoint * we can determine the softirq handler runtine. */ -DEFINE_EVENT(softirq, softirq_exit, +LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(irq_softirq, softirq_exit, + + irq_softirq_exit, TP_PROTO(struct softirq_action *h, struct softirq_action *vec), @@ -206,15 +173,17 @@ DEFINE_EVENT(softirq, softirq_exit, * When used in combination with the softirq_entry tracepoint * we can determine the softirq raise to run latency. */ -DEFINE_EVENT(softirq, softirq_raise, +LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(irq_softirq, softirq_raise, + + irq_softirq_raise, TP_PROTO(struct softirq_action *h, struct softirq_action *vec), TP_ARGS(h, vec) ) -#endif /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) */ +#endif /* #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(2,6,37)) */ -#endif /* _TRACE_IRQ_H */ +#endif /* LTTNG_TRACE_IRQ_H */ /* This part must be outside protection */ -#include "../../../probes/define_trace.h" +#include