From: Michael Jeanson Date: Thu, 8 Nov 2018 20:54:27 +0000 (-0500) Subject: Drop support for kernels < 3.0 from workqueue instrumentation X-Git-Tag: v2.12.0-pre~74 X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=53f94f76f992c775a128bf77356fba1b0e66df79;p=lttng-modules.git Drop support for kernels < 3.0 from workqueue instrumentation Signed-off-by: Michael Jeanson Signed-off-by: Mathieu Desnoyers --- diff --git a/instrumentation/events/lttng-module/workqueue.h b/instrumentation/events/lttng-module/workqueue.h index 07d6a53d..e0ef9178 100644 --- a/instrumentation/events/lttng-module/workqueue.h +++ b/instrumentation/events/lttng-module/workqueue.h @@ -9,8 +9,6 @@ #include #include -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)) - #ifndef _TRACE_WORKQUEUE_DEF_ #define _TRACE_WORKQUEUE_DEF_ @@ -30,7 +28,6 @@ LTTNG_TRACEPOINT_EVENT_CLASS(workqueue_work, ) ) -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) /** * workqueue_queue_work - called when a work gets queued * @req_cpu: the requested cpu @@ -76,7 +73,6 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(workqueue_work, workqueue_activate_work, TP_ARGS(work) ) -#endif /** * workqueue_execute_start - called immediately before the workqueue callback @@ -109,63 +105,6 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(workqueue_work, workqueue_execute_end, TP_ARGS(work) ) -#else - -LTTNG_TRACEPOINT_EVENT_CLASS(workqueue, - - TP_PROTO(struct task_struct *wq_thread, struct work_struct *work), - - TP_ARGS(wq_thread, work), - - TP_FIELDS( - ctf_array(char, thread_comm, wq_thread->comm, TASK_COMM_LEN) - ctf_integer(pid_t, thread_pid, wq_thread->pid) - ctf_integer_hex(work_func_t, func, work->func) - ) -) - -LTTNG_TRACEPOINT_EVENT_INSTANCE(workqueue, workqueue_insertion, - - TP_PROTO(struct task_struct *wq_thread, struct work_struct *work), - - TP_ARGS(wq_thread, work) -) - -LTTNG_TRACEPOINT_EVENT_INSTANCE(workqueue, workqueue_execution, - - TP_PROTO(struct task_struct *wq_thread, struct work_struct *work), - - TP_ARGS(wq_thread, work) -) - -/* Trace the creation of one workqueue thread on a cpu */ -LTTNG_TRACEPOINT_EVENT(workqueue_creation, - - TP_PROTO(struct task_struct *wq_thread, int cpu), - - TP_ARGS(wq_thread, cpu), - - TP_FIELDS( - ctf_array(char, thread_comm, wq_thread->comm, TASK_COMM_LEN) - ctf_integer(pid_t, thread_pid, wq_thread->pid) - ctf_integer(int, cpu, cpu) - ) -) - -LTTNG_TRACEPOINT_EVENT(workqueue_destruction, - - TP_PROTO(struct task_struct *wq_thread), - - TP_ARGS(wq_thread), - - TP_FIELDS( - ctf_array(char, thread_comm, wq_thread->comm, TASK_COMM_LEN) - ctf_integer(pid_t, thread_pid, wq_thread->pid) - ) -) - -#endif - #endif /* LTTNG_TRACE_WORKQUEUE_H */ /* This part must be outside protection */