Namespace kernel version macros

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

diff --git a/instrumentation/events/lttng-module/workqueue.h b/instrumentation/events/lttng-module/workqueue.h
index 3cdc7f9b279f02bb96465d74d0de7ec4d7bab191..367d42a5f3b319e4d0b8368a6db012a49dcedd41 100644 (file)
--- a/instrumentation/events/lttng-module/workqueue.h
+++ b/instrumentation/events/lttng-module/workqueue.h
@@ -1,14 +1,13 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM workqueue
 
 #if !defined(LTTNG_TRACE_WORKQUEUE_H) || defined(TRACE_HEADER_MULTI_READ)
 #define LTTNG_TRACE_WORKQUEUE_H
 
-#include "../../../probes/lttng-tracepoint-event.h"
+#include <probes/lttng-tracepoint-event.h>
 #include <linux/workqueue.h>
-#include <linux/version.h>
-
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36))
+#include <lttng-kernel-version.h>
 
 #ifndef _TRACE_WORKQUEUE_DEF_
 #define _TRACE_WORKQUEUE_DEF_
@@ -25,11 +24,10 @@ LTTNG_TRACEPOINT_EVENT_CLASS(workqueue_work,
        TP_ARGS(work),
 
        TP_FIELDS(
-               ctf_integer(void *, work, work)
+               ctf_integer_hex(void *, work, work)
        )
 )
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37))
 /**
  * workqueue_queue_work - called when a work gets queued
  * @req_cpu:   the requested cpu
@@ -42,7 +40,7 @@ LTTNG_TRACEPOINT_EVENT_CLASS(workqueue_work,
  */
 LTTNG_TRACEPOINT_EVENT(workqueue_queue_work,
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,9,0))
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,9,0))
        TP_PROTO(unsigned int req_cpu, struct pool_workqueue *pwq,
                 struct work_struct *work),
 
@@ -55,8 +53,8 @@ LTTNG_TRACEPOINT_EVENT(workqueue_queue_work,
 #endif
 
        TP_FIELDS(
-               ctf_integer(void *, work, work)
-               ctf_integer(void *, function, work->func)
+               ctf_integer_hex(void *, work, work)
+               ctf_integer_hex(void *, function, work->func)
                ctf_integer(unsigned int, req_cpu, req_cpu)
        )
 )
@@ -75,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
@@ -90,82 +87,46 @@ LTTNG_TRACEPOINT_EVENT(workqueue_execute_start,
        TP_ARGS(work),
 
        TP_FIELDS(
-               ctf_integer(void *, work, work)
-               ctf_integer(void *, function, work->func)
+               ctf_integer_hex(void *, work, work)
+               ctf_integer_hex(void *, function, work->func)
        )
 )
 
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,6,0))
 /**
  * workqueue_execute_end - called immediately after the workqueue callback
  * @work:      pointer to struct work_struct
+ * @function:  pointer to worker function
  *
  * Allows to track workqueue execution.
  */
-LTTNG_TRACEPOINT_EVENT_INSTANCE(workqueue_work, workqueue_execute_end,
-
-       TP_PROTO(struct work_struct *work),
-
-       TP_ARGS(work)
-)
-
-#else
-
-LTTNG_TRACEPOINT_EVENT_CLASS(workqueue,
+LTTNG_TRACEPOINT_EVENT(workqueue_execute_end,
 
-       TP_PROTO(struct task_struct *wq_thread, struct work_struct *work),
+       TP_PROTO(struct work_struct *work, work_func_t function),
 
-       TP_ARGS(wq_thread, work),
+       TP_ARGS(work, function),
 
        TP_FIELDS(
-               ctf_array(char, thread_comm, wq_thread->comm, TASK_COMM_LEN)
-               ctf_integer(pid_t, thread_pid, wq_thread->pid)
-               ctf_integer(work_func_t, func, work->func)
+               ctf_integer_hex(void *, work, work)
+               ctf_integer_hex(void *, function, function)
        )
 )
+#else
+/**
+ * workqueue_execute_end - called immediately after the workqueue callback
+ * @work:      pointer to struct work_struct
+ *
+ * Allows to track workqueue execution.
+ */
+LTTNG_TRACEPOINT_EVENT_INSTANCE(workqueue_work, workqueue_execute_end,
 
-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_PROTO(struct work_struct *work),
 
-       TP_FIELDS(
-               ctf_array(char, thread_comm, wq_thread->comm, TASK_COMM_LEN)
-               ctf_integer(pid_t, thread_pid, wq_thread->pid)
-       )
+       TP_ARGS(work)
 )
-
 #endif
 
 #endif /*  LTTNG_TRACE_WORKQUEUE_H */
 
 /* This part must be outside protection */
-#include "../../../probes/define_trace.h"
+#include <probes/define_trace.h>