From 82bc0b69afe20e50f2aec95e0e3b0004833da2ad Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Thu, 2 Apr 2020 14:07:47 -0400 Subject: [PATCH] fix: signal instrumentation for CentOS >= 4.18.0-147 Fixes: #1253 Signed-off-by: Michael Jeanson Signed-off-by: Mathieu Desnoyers Change-Id: I280013402df6f14222fbb912cdf64d80af3ab265 --- instrumentation/events/lttng-module/signal.h | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/instrumentation/events/lttng-module/signal.h b/instrumentation/events/lttng-module/signal.h index 7e9631d3..7c44cb14 100644 --- a/instrumentation/events/lttng-module/signal.h +++ b/instrumentation/events/lttng-module/signal.h @@ -13,7 +13,8 @@ #include #include #undef LTTNG_FIELDS_SIGINFO -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,20,0)) +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,20,0) || \ + LTTNG_RHEL_KERNEL_RANGE(4,18,0,147,0,0, 4,19,0,0,0,0)) #define LTTNG_FIELDS_SIGINFO(info) \ ctf_integer(int, errno, \ (info == SEND_SIG_NOINFO || info == SEND_SIG_PRIV) ? \ @@ -48,7 +49,8 @@ * 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(4,20,0)) +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,20,0) || \ + LTTNG_RHEL_KERNEL_RANGE(4,18,0,147,0,0, 4,19,0,0,0,0)) LTTNG_TRACEPOINT_EVENT(signal_generate, TP_PROTO(int sig, struct kernel_siginfo *info, struct task_struct *task, @@ -112,7 +114,8 @@ 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)) +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,20,0) || \ + LTTNG_RHEL_KERNEL_RANGE(4,18,0,147,0,0, 4,19,0,0,0,0)) LTTNG_TRACEPOINT_EVENT(signal_deliver, TP_PROTO(int sig, struct kernel_siginfo *info, struct k_sigaction *ka), -- 2.34.1