Rename LTTng instrumentation macros

[lttng-modules.git] / instrumentation / events / lttng-module / signal.h

diff --git a/instrumentation/events/lttng-module/signal.h b/instrumentation/events/lttng-module/signal.h
index c3529f973d6beb1870b45db15ff6f6d36630e3a0..d6aabd9a100344c3053dff934168b5f108051146 100644 (file)
--- a/instrumentation/events/lttng-module/signal.h
+++ b/instrumentation/events/lttng-module/signal.h
@@ -1,10 +1,10 @@
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM signal
 
-#if !defined(_TRACE_SIGNAL_H) || defined(TRACE_HEADER_MULTI_READ)
-#define _TRACE_SIGNAL_H
+#if !defined(LTTNG_TRACE_SIGNAL_H) || defined(TRACE_HEADER_MULTI_READ)
+#define LTTNG_TRACE_SIGNAL_H
 
-#include <linux/tracepoint.h>
+#include "../../../probes/lttng-tracepoint-event.h"
 #include <linux/version.h>
 
 #ifndef _TRACE_SIGNAL_DEF
@@ -36,7 +36,7 @@
  * means that si_code is SI_KERNEL.
  */
 #if (LINUX_VERSION_CODE < KERNEL_VERSION(3,4,0))
-TRACE_EVENT(signal_generate,
+LTTNG_TRACEPOINT_EVENT(signal_generate,
 
        TP_PROTO(int sig, struct siginfo *info, struct task_struct *task),
 
@@ -46,7 +46,7 @@ TRACE_EVENT(signal_generate,
                __field(        int,    sig                     )
                __field(        int,    errno                   )
                __field(        int,    code                    )
-               __array(        char,   comm,   TASK_COMM_LEN   )
+               __array_text(   char,   comm,   TASK_COMM_LEN   )
                __field(        pid_t,  pid                     )
        ),
 
@@ -62,7 +62,7 @@ TRACE_EVENT(signal_generate,
                  __entry->comm, __entry->pid)
 )
 #else
-TRACE_EVENT(signal_generate,
+LTTNG_TRACEPOINT_EVENT(signal_generate,
 
        TP_PROTO(int sig, struct siginfo *info, struct task_struct *task,
                        int group, int result),
@@ -73,7 +73,7 @@ TRACE_EVENT(signal_generate,
                __field(        int,    sig                     )
                __field(        int,    errno                   )
                __field(        int,    code                    )
-               __array(        char,   comm,   TASK_COMM_LEN   )
+               __array_text(   char,   comm,   TASK_COMM_LEN   )
                __field(        pid_t,  pid                     )
                __field(        int,    group                   )
                __field(        int,    result                  )
@@ -109,7 +109,7 @@ TRACE_EVENT(signal_generate,
  * This means, this can show which signals are actually delivered, but
  * matching generated signals and delivered signals may not be correct.
  */
-TRACE_EVENT(signal_deliver,
+LTTNG_TRACEPOINT_EVENT(signal_deliver,
 
        TP_PROTO(int sig, struct siginfo *info, struct k_sigaction *ka),
 
@@ -135,7 +135,8 @@ TRACE_EVENT(signal_deliver,
                  __entry->sa_handler, __entry->sa_flags)
 )
 
-DECLARE_EVENT_CLASS(signal_queue_overflow,
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,4,0))
+LTTNG_TRACEPOINT_EVENT_CLASS(signal_queue_overflow,
 
        TP_PROTO(int sig, int group, struct siginfo *info),
 
@@ -169,7 +170,7 @@ DECLARE_EVENT_CLASS(signal_queue_overflow,
  * 'group' is not 0 if the signal will be sent to a process group.
  * 'sig' is always one of RT signals.
  */
-DEFINE_EVENT(signal_queue_overflow, signal_overflow_fail,
+LTTNG_TRACEPOINT_EVENT_INSTANCE(signal_queue_overflow, signal_overflow_fail,
 
        TP_PROTO(int sig, int group, struct siginfo *info),
 
@@ -187,14 +188,15 @@ DEFINE_EVENT(signal_queue_overflow, signal_overflow_fail,
  * 'group' is not 0 if the signal will be sent to a process group.
  * 'sig' is always one of non-RT signals.
  */
-DEFINE_EVENT(signal_queue_overflow, signal_lose_info,
+LTTNG_TRACEPOINT_EVENT_INSTANCE(signal_queue_overflow, signal_lose_info,
 
        TP_PROTO(int sig, int group, struct siginfo *info),
 
        TP_ARGS(sig, group, info)
 )
+#endif
 
-#endif /* _TRACE_SIGNAL_H */
+#endif /* LTTNG_TRACE_SIGNAL_H */
 
 /* This part must be outside protection */
 #include "../../../probes/define_trace.h"