Fix: sunrpc instrumentation for 4.17

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

diff --git a/instrumentation/events/lttng-module/rpc.h b/instrumentation/events/lttng-module/rpc.h
index bcaafbc12c084dc365cd9287b95be36d3220d4b7..b9e45fef88ebc5b8957cb824b162b34ed2411762 100644 (file)
--- a/instrumentation/events/lttng-module/rpc.h
+++ b/instrumentation/events/lttng-module/rpc.h
@@ -4,7 +4,7 @@
 #if !defined(LTTNG_TRACE_RPC_H) || defined(TRACE_HEADER_MULTI_READ)
 #define LTTNG_TRACE_RPC_H
 
-#include "../../../probes/lttng-tracepoint-event.h"
+#include <probes/lttng-tracepoint-event.h>
 #include <linux/sunrpc/sched.h>
 #include <linux/sunrpc/clnt.h>
 
@@ -14,19 +14,11 @@ LTTNG_TRACEPOINT_EVENT_CLASS(rpc_task_status,
 
        TP_ARGS(task),
 
-       TP_STRUCT__entry(
-               __field(const struct rpc_task *, task)
-               __field(const struct rpc_clnt *, clnt)
-               __field(int, status)
-       ),
-
-       TP_fast_assign(
-               tp_assign(task, task)
-               tp_assign(clnt, task->tk_client)
-               tp_assign(status, task->tk_status)
-       ),
-
-       TP_printk("task:%p@%p, status %d",__entry->task, __entry->clnt, __entry->status)
+       TP_FIELDS(
+               ctf_integer_hex(const struct rpc_task *, task, task)
+               ctf_integer_hex(const struct rpc_clnt *, clnt, task->tk_client)
+               ctf_integer(int, status, task->tk_status)
+       )
 )
 
 LTTNG_TRACEPOINT_EVENT_INSTANCE(rpc_task_status, rpc_call_status,
@@ -41,24 +33,98 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(rpc_task_status, rpc_bind_status,
        TP_ARGS(task)
 )
 
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,17,0))
 LTTNG_TRACEPOINT_EVENT(rpc_connect_status,
-       TP_PROTO(struct rpc_task *task, int status),
+       TP_PROTO(const struct rpc_task *task),
 
-       TP_ARGS(task, status),
+       TP_ARGS(task),
+
+       TP_FIELDS(
+               ctf_integer_hex(const struct rpc_task *, task, task)
+               ctf_integer_hex(const struct rpc_clnt *, clnt, task->tk_client)
+               ctf_integer(int, status, task->tk_status)
+       )
+)
+
+LTTNG_TRACEPOINT_EVENT_CLASS(rpc_task_running,
+
+       TP_PROTO(const struct rpc_task *task, const void *action),
+
+       TP_ARGS(task, action),
+
+       TP_FIELDS(
+               ctf_integer_hex(const struct rpc_clnt *, clnt, task->tk_client)
+               ctf_integer_hex(const struct rpc_task *, task, task)
+               ctf_integer_hex(const void *, action, action)
+               ctf_integer(unsigned long, runstate, task->tk_runstate)
+               ctf_integer(int, status, task->tk_status)
+               ctf_integer(unsigned short, flags, task->tk_flags)
+       )
+)
+
+LTTNG_TRACEPOINT_EVENT_INSTANCE(rpc_task_running, rpc_task_begin,
+
+       TP_PROTO(const struct rpc_task *task, const void *action),
+
+       TP_ARGS(task, action)
+)
+
+LTTNG_TRACEPOINT_EVENT_INSTANCE(rpc_task_running, rpc_task_run_action,
+
+       TP_PROTO(const struct rpc_task *task, const void *action),
+
+       TP_ARGS(task, action)
+)
+
+LTTNG_TRACEPOINT_EVENT_INSTANCE(rpc_task_running, rpc_task_complete,
+
+       TP_PROTO(const struct rpc_task *task, const void *action),
 
-       TP_STRUCT__entry(
-               __field(const struct rpc_task *, task)
-               __field(const struct rpc_clnt *, clnt)
-               __field(int, status)
-       ),
+       TP_ARGS(task, action)
+)
+
+LTTNG_TRACEPOINT_EVENT_CLASS(rpc_task_queued,
+
+       TP_PROTO(const struct rpc_task *task, const struct rpc_wait_queue *q),
+
+       TP_ARGS(task, q),
+
+       TP_FIELDS(
+               ctf_integer_hex(const struct rpc_clnt *, clnt, task->tk_client)
+               ctf_integer_hex(const struct rpc_task *, task, task)
+               ctf_integer(unsigned long, timeout, task->tk_timeout)
+               ctf_integer(unsigned long, runstate, task->tk_runstate)
+               ctf_integer(int, status, task->tk_status)
+               ctf_integer(unsigned short, flags, task->tk_flags)
+               ctf_string(q_name, rpc_qname(q))
+       )
+)
+
+LTTNG_TRACEPOINT_EVENT_INSTANCE(rpc_task_queued, rpc_task_sleep,
+
+       TP_PROTO(const struct rpc_task *task, const struct rpc_wait_queue *q),
+
+       TP_ARGS(task, q)
+)
+
+LTTNG_TRACEPOINT_EVENT_INSTANCE(rpc_task_queued, rpc_task_wakeup,
 
-       TP_fast_assign(
-               tp_assign(task, task)
-               tp_assign(clnt, task->tk_client)
-               tp_assign(status, status)
-       ),
+       TP_PROTO(const struct rpc_task *task, const struct rpc_wait_queue *q),
 
-       TP_printk("task:%p@%p, status %d",__entry->task, __entry->clnt, __entry->status)
+       TP_ARGS(task, q)
+)
+
+#else
+LTTNG_TRACEPOINT_EVENT(rpc_connect_status,
+       TP_PROTO(struct rpc_task *task, int status),
+
+       TP_ARGS(task, status),
+
+       TP_FIELDS(
+               ctf_integer_hex(const struct rpc_task *, task, task)
+               ctf_integer_hex(const struct rpc_clnt *, clnt, task->tk_client)
+               ctf_integer(int, status, status)
+       )
 )
 
 LTTNG_TRACEPOINT_EVENT_CLASS(rpc_task_running,
@@ -67,32 +133,14 @@ LTTNG_TRACEPOINT_EVENT_CLASS(rpc_task_running,
 
        TP_ARGS(clnt, task, action),
 
-       TP_STRUCT__entry(
-               __field(const struct rpc_clnt *, clnt)
-               __field(const struct rpc_task *, task)
-               __field(const void *, action)
-               __field(unsigned long, runstate)
-               __field(int, status)
-               __field(unsigned short, flags)
-               ),
-
-       TP_fast_assign(
-               tp_assign(clnt, clnt)
-               tp_assign(task, task)
-               tp_assign(action, action)
-               tp_assign(runstate, task->tk_runstate)
-               tp_assign(status, task->tk_status)
-               tp_assign(flags, task->tk_flags)
-               ),
-
-       TP_printk("task:%p@%p flags=%4.4x state=%4.4lx status=%d action=%pf",
-               __entry->task,
-               __entry->clnt,
-               __entry->flags,
-               __entry->runstate,
-               __entry->status,
-               __entry->action
-               )
+       TP_FIELDS(
+               ctf_integer_hex(const struct rpc_clnt *, clnt, clnt)
+               ctf_integer_hex(const struct rpc_task *, task, task)
+               ctf_integer_hex(const void *, action, action)
+               ctf_integer(unsigned long, runstate, task->tk_runstate)
+               ctf_integer(int, status, task->tk_status)
+               ctf_integer(unsigned short, flags, task->tk_flags)
+       )
 )
 
 LTTNG_TRACEPOINT_EVENT_INSTANCE(rpc_task_running, rpc_task_begin,
@@ -100,7 +148,6 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(rpc_task_running, rpc_task_begin,
        TP_PROTO(const struct rpc_clnt *clnt, const struct rpc_task *task, const void *action),
 
        TP_ARGS(clnt, task, action)
-
 )
 
 LTTNG_TRACEPOINT_EVENT_INSTANCE(rpc_task_running, rpc_task_run_action,
@@ -108,7 +155,6 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(rpc_task_running, rpc_task_run_action,
        TP_PROTO(const struct rpc_clnt *clnt, const struct rpc_task *task, const void *action),
 
        TP_ARGS(clnt, task, action)
-
 )
 
 LTTNG_TRACEPOINT_EVENT_INSTANCE(rpc_task_running, rpc_task_complete,
@@ -116,7 +162,6 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(rpc_task_running, rpc_task_complete,
        TP_PROTO(const struct rpc_clnt *clnt, const struct rpc_task *task, const void *action),
 
        TP_ARGS(clnt, task, action)
-
 )
 
 LTTNG_TRACEPOINT_EVENT_CLASS(rpc_task_queued,
@@ -125,35 +170,15 @@ LTTNG_TRACEPOINT_EVENT_CLASS(rpc_task_queued,
 
        TP_ARGS(clnt, task, q),
 
-       TP_STRUCT__entry(
-               __field(const struct rpc_clnt *, clnt)
-               __field(const struct rpc_task *, task)
-               __field(unsigned long, timeout)
-               __field(unsigned long, runstate)
-               __field(int, status)
-               __field(unsigned short, flags)
-               __string(q_name, rpc_qname(q))
-               ),
-
-       TP_fast_assign(
-               tp_assign(clnt, clnt)
-               tp_assign(task, task)
-               tp_assign(timeout, task->tk_timeout)
-               tp_assign(runstate, task->tk_runstate)
-               tp_assign(status, task->tk_status)
-               tp_assign(flags, task->tk_flags)
-               tp_strcpy(q_name, rpc_qname(q))
-               ),
-
-       TP_printk("task:%p@%p flags=%4.4x state=%4.4lx status=%d timeout=%lu queue=%s",
-               __entry->task,
-               __entry->clnt,
-               __entry->flags,
-               __entry->runstate,
-               __entry->status,
-               __entry->timeout,
-               __get_str(q_name)
-               )
+       TP_FIELDS(
+               ctf_integer_hex(const struct rpc_clnt *, clnt, clnt)
+               ctf_integer_hex(const struct rpc_task *, task, task)
+               ctf_integer(unsigned long, timeout, task->tk_timeout)
+               ctf_integer(unsigned long, runstate, task->tk_runstate)
+               ctf_integer(int, status, task->tk_status)
+               ctf_integer(unsigned short, flags, task->tk_flags)
+               ctf_string(q_name, rpc_qname(q))
+       )
 )
 
 LTTNG_TRACEPOINT_EVENT_INSTANCE(rpc_task_queued, rpc_task_sleep,
@@ -161,7 +186,6 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(rpc_task_queued, rpc_task_sleep,
        TP_PROTO(const struct rpc_clnt *clnt, const struct rpc_task *task, const struct rpc_wait_queue *q),
 
        TP_ARGS(clnt, task, q)
-
 )
 
 LTTNG_TRACEPOINT_EVENT_INSTANCE(rpc_task_queued, rpc_task_wakeup,
@@ -169,9 +193,9 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(rpc_task_queued, rpc_task_wakeup,
        TP_PROTO(const struct rpc_clnt *clnt, const struct rpc_task *task, const struct rpc_wait_queue *q),
 
        TP_ARGS(clnt, task, q)
-
 )
+#endif
 
 #endif /* LTTNG_TRACE_RPC_H */
 
-#include "../../../probes/define_trace.h"
+#include <probes/define_trace.h>