X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=instrumentation%2Fevents%2Flttng-module%2Frpc.h;h=f492a37342cc931b63f2e6e175d470ef864e2b1d;hb=78f56ae3a0c007bf1be7e01731d372f79fe6781e;hp=fb131060c4fa571e77d7ac0bca192b8e211a7d96;hpb=1ff7013bcf7f068cf4371d12d758f9c0fd16a619;p=lttng-modules.git diff --git a/instrumentation/events/lttng-module/rpc.h b/instrumentation/events/lttng-module/rpc.h index fb131060..f492a373 100644 --- a/instrumentation/events/lttng-module/rpc.h +++ b/instrumentation/events/lttng-module/rpc.h @@ -9,7 +9,31 @@ #include #include -#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_RHEL_KERNEL_RANGE(4,18,0,193,0,0, 4,19,0,0,0,0)) LTTNG_TRACEPOINT_EVENT_CLASS(rpc_task_status, TP_PROTO(const struct rpc_task *task), @@ -18,7 +42,7 @@ LTTNG_TRACEPOINT_EVENT_CLASS(rpc_task_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, task->tk_status) ) ) @@ -34,7 +58,7 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(rpc_task_status, rpc_bind_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), @@ -43,7 +67,7 @@ LTTNG_TRACEPOINT_EVENT_CLASS(rpc_task_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, task->tk_status) ) ) @@ -86,13 +110,13 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(rpc_task_status, rpc_bind_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), @@ -100,11 +124,11 @@ LTTNG_TRACEPOINT_EVENT(rpc_connect_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, 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), @@ -112,7 +136,7 @@ LTTNG_TRACEPOINT_EVENT(rpc_connect_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) ) ) @@ -130,7 +154,7 @@ LTTNG_TRACEPOINT_EVENT(rpc_connect_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), @@ -139,7 +163,7 @@ LTTNG_TRACEPOINT_EVENT_CLASS(rpc_task_running, 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) @@ -176,7 +200,7 @@ LTTNG_TRACEPOINT_EVENT_CLASS(rpc_task_queued, 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) @@ -199,7 +223,7 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(rpc_task_queued, rpc_task_wakeup, 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), @@ -208,7 +232,7 @@ LTTNG_TRACEPOINT_EVENT_CLASS(rpc_task_running, 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) @@ -245,7 +269,7 @@ LTTNG_TRACEPOINT_EVENT_CLASS(rpc_task_queued, 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)