#include <linux/sunrpc/sched.h>
#include <linux/sunrpc/clnt.h>
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,0,0))
+#ifndef ONCE_LTTNG_RPC_H
+#define ONCE_LTTNG_RPC_H
+
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,12,0))
+static inline
+int lttng_get_clid(const struct rpc_task *task)
+{
+ struct rpc_clnt *tk_client;
+
+ tk_client = task->tk_client;
+ if (!tk_client)
+ return -1;
+ /*
+ * The cl_clid field is always initialized to positive signed
+ * integers. Negative signed integer values are treated as
+ * errors.
+ */
+ return (int) tk_client->cl_clid;
+}
+#endif /* #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,12,0)) */
+
+#endif /* ONCE_LTTNG_RPC_H */
+
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,0,0))
LTTNG_TRACEPOINT_EVENT_CLASS(rpc_task_status,
TP_PROTO(const struct rpc_task *task),
TP_FIELDS(
ctf_integer(unsigned int, task_id, task->tk_pid)
- ctf_integer(unsigned int, client_id, task->tk_client->cl_clid)
+ ctf_integer(int, client_id, lttng_get_clid(task))
ctf_integer(int, status, task->tk_status)
)
)
TP_ARGS(task)
)
-#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3,12,0))
+#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,12,0))
LTTNG_TRACEPOINT_EVENT_CLASS(rpc_task_status,
TP_PROTO(struct rpc_task *task),
TP_FIELDS(
ctf_integer(unsigned int, task_id, task->tk_pid)
- ctf_integer(unsigned int, client_id, task->tk_client->cl_clid)
+ ctf_integer(int, client_id, lttng_get_clid(task))
ctf_integer(int, status, task->tk_status)
)
)
)
#endif
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,0,0))
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,0,0))
LTTNG_TRACEPOINT_EVENT_INSTANCE(rpc_task_status, rpc_connect_status,
TP_PROTO(const struct rpc_task *task),
TP_ARGS(task)
)
-#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(4,17,0))
+#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,17,0))
LTTNG_TRACEPOINT_EVENT(rpc_connect_status,
TP_PROTO(const struct rpc_task *task),
TP_FIELDS(
ctf_integer(unsigned int, task_id, task->tk_pid)
- ctf_integer(unsigned int, client_id, task->tk_client->cl_clid)
+ ctf_integer(int, client_id, lttng_get_clid(task))
ctf_integer(int, status, task->tk_status)
)
)
-#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3,12,0))
+#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,12,0))
LTTNG_TRACEPOINT_EVENT(rpc_connect_status,
TP_PROTO(struct rpc_task *task, int status),
TP_FIELDS(
ctf_integer(unsigned int, task_id, task->tk_pid)
- ctf_integer(unsigned int, client_id, task->tk_client->cl_clid)
+ ctf_integer(int, client_id, lttng_get_clid(task))
ctf_integer(int, status, status)
)
)
)
#endif
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,17,0))
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,17,0))
LTTNG_TRACEPOINT_EVENT_CLASS(rpc_task_running,
TP_PROTO(const struct rpc_task *task, const void *action),
TP_FIELDS(
ctf_integer(unsigned int, task_id, task->tk_pid)
- ctf_integer(unsigned int, client_id, task->tk_client ? task->tk_client->cl_clid : -1)
+ ctf_integer(int, client_id, lttng_get_clid(task))
ctf_integer_hex(const void *, action, action)
ctf_integer(unsigned long, runstate, task->tk_runstate)
ctf_integer(int, status, task->tk_status)
TP_FIELDS(
ctf_integer(unsigned int, task_id, task->tk_pid)
- ctf_integer(unsigned int, client_id, task->tk_client->cl_clid)
+ ctf_integer(int, client_id, lttng_get_clid(task))
ctf_integer(unsigned long, timeout, task->tk_timeout)
ctf_integer(unsigned long, runstate, task->tk_runstate)
ctf_integer(int, status, task->tk_status)
TP_ARGS(task, q)
)
-#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3,12,0))
+#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,12,0))
LTTNG_TRACEPOINT_EVENT_CLASS(rpc_task_running,
TP_PROTO(const struct rpc_clnt *clnt, const struct rpc_task *task, const void *action),
TP_FIELDS(
ctf_integer(unsigned int, task_id, task->tk_pid)
- ctf_integer(unsigned int, client_id, task->tk_client ? task->tk_client->cl_clid : -1)
+ ctf_integer(int, client_id, lttng_get_clid(task))
ctf_integer_hex(const void *, action, action)
ctf_integer(unsigned long, runstate, task->tk_runstate)
ctf_integer(int, status, task->tk_status)
TP_FIELDS(
ctf_integer(unsigned int, task_id, task->tk_pid)
- ctf_integer(unsigned int, client_id, task->tk_client->cl_clid)
+ ctf_integer(int, client_id, lttng_get_clid(task))
ctf_integer(unsigned long, timeout, task->tk_timeout)
ctf_integer(unsigned long, runstate, task->tk_runstate)
ctf_integer(int, status, task->tk_status)