From: Mathieu Desnoyers Date: Mon, 13 Apr 2020 20:34:08 +0000 (-0400) Subject: instrumentation: signal: remove compatibility code X-Git-Tag: for-upstreaming-review-1~45 X-Git-Url: http://git.liburcu.org/?p=lttng-modules.git;a=commitdiff_plain;h=ef9d62b6d43be54b08127f142633addd533a9b9b instrumentation: signal: remove compatibility code --- diff --git a/instrumentation/events/lttng-module/signal.h b/instrumentation/events/lttng-module/signal.h index 2b1fac82..810dcbea 100644 --- a/instrumentation/events/lttng-module/signal.h +++ b/instrumentation/events/lttng-module/signal.h @@ -6,15 +6,12 @@ #define LTTNG_TRACE_SIGNAL_H #include -#include #ifndef _TRACE_SIGNAL_DEF #define _TRACE_SIGNAL_DEF #include #include #undef LTTNG_FIELDS_SIGINFO -#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) ? \ @@ -24,17 +21,6 @@ (info == SEND_SIG_NOINFO) ? \ SI_USER : \ ((info == SEND_SIG_PRIV) ? SI_KERNEL : info->si_code)) -#else /* LINUX_VERSION_CODE >= KERNEL_VERSION(4,20,0) */ -#define LTTNG_FIELDS_SIGINFO(info) \ - ctf_integer(int, errno, \ - (info == SEND_SIG_NOINFO || info == SEND_SIG_FORCED || info == SEND_SIG_PRIV) ? \ - 0 : \ - info->si_errno) \ - ctf_integer(int, code, \ - (info == SEND_SIG_NOINFO || info == SEND_SIG_FORCED) ? \ - SI_USER : \ - ((info == SEND_SIG_PRIV) ? SI_KERNEL : info->si_code)) -#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(4,20,0) */ #endif /* _TRACE_SIGNAL_DEF */ /** @@ -49,8 +35,6 @@ * 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) || \ - 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, @@ -67,38 +51,6 @@ LTTNG_TRACEPOINT_EVENT(signal_generate, ctf_integer(int, result, result) ) ) -#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, - int group, int result), - - 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 -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 /** * signal_deliver - called when a signal is delivered @@ -114,8 +66,6 @@ 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_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), @@ -129,72 +79,6 @@ LTTNG_TRACEPOINT_EVENT(signal_deliver, 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), - - 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) - ) -) -#endif - -#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), - - TP_ARGS(sig, group, info), - - TP_FIELDS( - ctf_integer(int, sig, sig) - ctf_integer(int, group, group) - LTTNG_FIELDS_SIGINFO(info) - ) -) - -/** - * signal_overflow_fail - called when signal queue is overflow - * @sig: signal number - * @group: signal to process group or not (bool) - * @info: pointer to struct siginfo - * - * Kernel fails to generate 'sig' signal with 'info' siginfo, because - * siginfo queue is overflow, and the signal is dropped. - * 'group' is not 0 if the signal will be sent to a process group. - * 'sig' is always one of RT signals. - */ -LTTNG_TRACEPOINT_EVENT_INSTANCE(signal_queue_overflow, signal_overflow_fail, - - TP_PROTO(int sig, int group, struct siginfo *info), - - TP_ARGS(sig, group, info) -) - -/** - * signal_lose_info - called when siginfo is lost - * @sig: signal number - * @group: signal to process group or not (bool) - * @info: pointer to struct siginfo - * - * Kernel generates 'sig' signal but loses 'info' siginfo, because siginfo - * queue is overflow. - * 'group' is not 0 if the signal will be sent to a process group. - * 'sig' is always one of non-RT signals. - */ -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 /* LTTNG_TRACE_SIGNAL_H */