X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=instrumentation%2Fevents%2Flttng-module%2Frpc.h;h=8b15cfab6e2844561f57110312b5ed2ddb044b23;hb=a6b7e443b580cf9d79d556239f0c131ce34dd95a;hp=bcaafbc12c084dc365cd9287b95be36d3220d4b7;hpb=9bbf98da13bbaf289ac5787a80325d2e1dd81d0d;p=lttng-modules.git diff --git a/instrumentation/events/lttng-module/rpc.h b/instrumentation/events/lttng-module/rpc.h index bcaafbc1..8b15cfab 100644 --- a/instrumentation/events/lttng-module/rpc.h +++ b/instrumentation/events/lttng-module/rpc.h @@ -1,177 +1,134 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ #undef TRACE_SYSTEM #define TRACE_SYSTEM rpc #if !defined(LTTNG_TRACE_RPC_H) || defined(TRACE_HEADER_MULTI_READ) #define LTTNG_TRACE_RPC_H -#include "../../../probes/lttng-tracepoint-event.h" +#include #include #include -LTTNG_TRACEPOINT_EVENT_CLASS(rpc_task_status, +#ifndef ONCE_LTTNG_RPC_H +#define ONCE_LTTNG_RPC_H - TP_PROTO(struct rpc_task *task), +static inline +int lttng_get_clid(const struct rpc_task *task) +{ + struct rpc_clnt *tk_client; - TP_ARGS(task), + 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 /* ONCE_LTTNG_RPC_H */ + +LTTNG_TRACEPOINT_EVENT_CLASS(rpc_task_status, - TP_STRUCT__entry( - __field(const struct rpc_task *, task) - __field(const struct rpc_clnt *, clnt) - __field(int, status) - ), + TP_PROTO(const struct rpc_task *task), - TP_fast_assign( - tp_assign(task, task) - tp_assign(clnt, task->tk_client) - tp_assign(status, task->tk_status) - ), + TP_ARGS(task), - TP_printk("task:%p@%p, status %d",__entry->task, __entry->clnt, __entry->status) + TP_FIELDS( + ctf_integer(unsigned int, task_id, task->tk_pid) + ctf_integer(int, client_id, lttng_get_clid(task)) + ctf_integer(int, status, task->tk_status) + ) ) LTTNG_TRACEPOINT_EVENT_INSTANCE(rpc_task_status, rpc_call_status, - TP_PROTO(struct rpc_task *task), + TP_PROTO(const struct rpc_task *task), TP_ARGS(task) ) LTTNG_TRACEPOINT_EVENT_INSTANCE(rpc_task_status, rpc_bind_status, - TP_PROTO(struct rpc_task *task), + TP_PROTO(const struct rpc_task *task), TP_ARGS(task) ) -LTTNG_TRACEPOINT_EVENT(rpc_connect_status, - TP_PROTO(struct rpc_task *task, int status), - - TP_ARGS(task, status), - - TP_STRUCT__entry( - __field(const struct rpc_task *, task) - __field(const struct rpc_clnt *, clnt) - __field(int, status) - ), +LTTNG_TRACEPOINT_EVENT_INSTANCE(rpc_task_status, rpc_connect_status, + TP_PROTO(const struct rpc_task *task), - TP_fast_assign( - tp_assign(task, task) - tp_assign(clnt, task->tk_client) - tp_assign(status, status) - ), - - TP_printk("task:%p@%p, status %d",__entry->task, __entry->clnt, __entry->status) + TP_ARGS(task) ) 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_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_PROTO(const struct rpc_task *task, const void *action), + + TP_ARGS(task, action), + + TP_FIELDS( + ctf_integer(unsigned int, task_id, task->tk_pid) + 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) + 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) + 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_clnt *clnt, const struct rpc_task *task, const void *action), - - TP_ARGS(clnt, task, 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_clnt *clnt, const struct rpc_task *task, const void *action), - - TP_ARGS(clnt, task, action) + TP_PROTO(const struct rpc_task *task, const void *action), + TP_ARGS(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_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_PROTO(const struct rpc_task *task, const struct rpc_wait_queue *q), + + TP_ARGS(task, q), + + TP_FIELDS( + ctf_integer(unsigned int, task_id, task->tk_pid) + 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) + 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) + 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_PROTO(const struct rpc_clnt *clnt, const struct rpc_task *task, const struct rpc_wait_queue *q), - - TP_ARGS(clnt, task, q) + TP_PROTO(const struct rpc_task *task, const struct rpc_wait_queue *q), + TP_ARGS(task, q) ) #endif /* LTTNG_TRACE_RPC_H */ -#include "../../../probes/define_trace.h" +#include