Fix: signal: Distinguish between kernel_siginfo and siginfo (v4.20)

[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 68045ce6fb3a2b8e1d96079caf7daabf542ae2aa..6c484ba2f50064fefde47c824a6c3f6bb2151187 100644 (file)
--- a/instrumentation/events/lttng-module/signal.h
+++ b/instrumentation/events/lttng-module/signal.h
@@ -36,21 +36,24 @@
  * SEND_SIG_NOINFO means that si_code is SI_USER, and SEND_SIG_PRIV
  * means that si_code is SI_KERNEL.
  */
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,4,0))
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,20,0))
 LTTNG_TRACEPOINT_EVENT(signal_generate,
 
-       TP_PROTO(int sig, struct siginfo *info, struct task_struct *task),
+       TP_PROTO(int sig, struct kernel_siginfo *info, struct task_struct *task,
+                       int group, int result),
 
-       TP_ARGS(sig, info, task),
+       TP_ARGS(sig, info, task, group, result),
 
        TP_FIELDS(
                ctf_integer(int, sig, sig)
                LTTNG_FIELDS_SIGINFO(info)
                ctf_array_text(char, comm, task->comm, TASK_COMM_LEN)
                ctf_integer(pid_t, pid, task->pid)
+               ctf_integer(int, group, group)
+               ctf_integer(int, result, result)
        )
 )
-#else
+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0))
 LTTNG_TRACEPOINT_EVENT(signal_generate,
 
        TP_PROTO(int sig, struct siginfo *info, struct task_struct *task,
@@ -67,6 +70,20 @@ LTTNG_TRACEPOINT_EVENT(signal_generate,
                ctf_integer(int, result, result)
        )
 )
+#else
+LTTNG_TRACEPOINT_EVENT(signal_generate,
+
+       TP_PROTO(int sig, struct siginfo *info, struct task_struct *task),
+
+       TP_ARGS(sig, info, task),
+
+       TP_FIELDS(
+               ctf_integer(int, sig, sig)
+               LTTNG_FIELDS_SIGINFO(info)
+               ctf_array_text(char, comm, task->comm, TASK_COMM_LEN)
+               ctf_integer(pid_t, pid, task->pid)
+       )
+)
 #endif
 
 /**
@@ -83,6 +100,21 @@ LTTNG_TRACEPOINT_EVENT(signal_generate,
  * This means, this can show which signals are actually delivered, but
  * matching generated signals and delivered signals may not be correct.
  */
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,20,0))
+LTTNG_TRACEPOINT_EVENT(signal_deliver,
+
+       TP_PROTO(int sig, struct kernel_siginfo *info, struct k_sigaction *ka),
+
+       TP_ARGS(sig, info, ka),
+
+       TP_FIELDS(
+               ctf_integer(int, sig, sig)
+               LTTNG_FIELDS_SIGINFO(info)
+               ctf_integer(unsigned long, sa_handler, (unsigned long) ka->sa.sa_handler)
+               ctf_integer(unsigned long, sa_flags, ka->sa.sa_flags)
+       )
+)
+#else
 LTTNG_TRACEPOINT_EVENT(signal_deliver,
 
        TP_PROTO(int sig, struct siginfo *info, struct k_sigaction *ka),
@@ -96,6 +128,7 @@ LTTNG_TRACEPOINT_EVENT(signal_deliver,
                ctf_integer(unsigned long, sa_flags, ka->sa.sa_flags)
        )
 )
+#endif
 
 #if (LINUX_VERSION_CODE < KERNEL_VERSION(3,4,0))
 LTTNG_TRACEPOINT_EVENT_CLASS(signal_queue_overflow,