X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=include%2Finstrumentation%2Fevents%2Frpc.h;h=ca448b369d8b61162495ed2ce82801fcf3c79643;hb=d8c1ffac894a89402169a8a9083022843a18851c;hp=90499aee6ae4830bdae27dcd044abc3fe0316b7f;hpb=4f47ccf08dfac3d5db7553eb8b40bdab19764727;p=lttng-modules.git diff --git a/include/instrumentation/events/rpc.h b/include/instrumentation/events/rpc.h index 90499aee..ca448b36 100644 --- a/include/instrumentation/events/rpc.h +++ b/include/instrumentation/events/rpc.h @@ -12,7 +12,6 @@ #ifndef ONCE_LTTNG_RPC_H #define ONCE_LTTNG_RPC_H -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,12,0)) static inline int lttng_get_clid(const struct rpc_task *task) { @@ -28,11 +27,11 @@ int lttng_get_clid(const struct rpc_task *task) */ return (int) tk_client->cl_clid; } -#endif /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,12,0)) */ #endif /* ONCE_LTTNG_RPC_H */ -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,0,0)) +#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), @@ -57,7 +56,7 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(rpc_task_status, rpc_bind_status, TP_ARGS(task) ) -#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3,12,0)) +#else LTTNG_TRACEPOINT_EVENT_CLASS(rpc_task_status, TP_PROTO(struct rpc_task *task), @@ -77,31 +76,6 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(rpc_task_status, rpc_call_status, TP_ARGS(task) ) -LTTNG_TRACEPOINT_EVENT_INSTANCE(rpc_task_status, rpc_bind_status, - TP_PROTO(struct rpc_task *task), - - TP_ARGS(task) -) -#else -LTTNG_TRACEPOINT_EVENT_CLASS(rpc_task_status, - - TP_PROTO(struct rpc_task *task), - - 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_INSTANCE(rpc_task_status, rpc_call_status, - TP_PROTO(struct rpc_task *task), - - TP_ARGS(task) -) - LTTNG_TRACEPOINT_EVENT_INSTANCE(rpc_task_status, rpc_bind_status, TP_PROTO(struct rpc_task *task), @@ -109,13 +83,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), @@ -127,7 +101,7 @@ LTTNG_TRACEPOINT_EVENT(rpc_connect_status, ctf_integer(int, status, task->tk_status) ) ) -#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3,12,0)) +#else LTTNG_TRACEPOINT_EVENT(rpc_connect_status, TP_PROTO(struct rpc_task *task, int status), @@ -139,21 +113,9 @@ LTTNG_TRACEPOINT_EVENT(rpc_connect_status, ctf_integer(int, status, status) ) ) -#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) - ) -) #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), @@ -222,7 +184,7 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(rpc_task_queued, rpc_task_wakeup, TP_ARGS(task, q) ) -#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3,12,0)) +#else LTTNG_TRACEPOINT_EVENT_CLASS(rpc_task_running, TP_PROTO(const struct rpc_clnt *clnt, const struct rpc_task *task, const void *action), @@ -284,75 +246,6 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(rpc_task_queued, rpc_task_sleep, TP_ARGS(clnt, task, q) ) -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) -) - -#else -LTTNG_TRACEPOINT_EVENT_CLASS(rpc_task_running, - - TP_PROTO(const struct rpc_clnt *clnt, const struct rpc_task *task, const void *action), - - TP_ARGS(clnt, task, 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, - - 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, - - 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, - - 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, - - TP_PROTO(const struct rpc_clnt *clnt, const struct rpc_task *task, const struct rpc_wait_queue *q), - - TP_ARGS(clnt, task, q), - - 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, - - 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, TP_PROTO(const struct rpc_clnt *clnt, const struct rpc_task *task, const struct rpc_wait_queue *q),