mirror of
https://github.com/torvalds/linux.git
synced 2024-11-22 12:11:40 +00:00
2c92ca849f
With the rework of how the __string() handles dynamic strings where it
saves off the source string in field in the helper structure[1], the
assignment of that value to the trace event field is stored in the helper
value and does not need to be passed in again.
This means that with:
__string(field, mystring)
Which use to be assigned with __assign_str(field, mystring), no longer
needs the second parameter and it is unused. With this, __assign_str()
will now only get a single parameter.
There's over 700 users of __assign_str() and because coccinelle does not
handle the TRACE_EVENT() macro I ended up using the following sed script:
git grep -l __assign_str | while read a ; do
sed -e 's/\(__assign_str([^,]*[^ ,]\) *,[^;]*/\1)/' $a > /tmp/test-file;
mv /tmp/test-file $a;
done
I then searched for __assign_str() that did not end with ';' as those
were multi line assignments that the sed script above would fail to catch.
Note, the same updates will need to be done for:
__assign_str_len()
__assign_rel_str()
__assign_rel_str_len()
I tested this with both an allmodconfig and an allyesconfig (build only for both).
[1] https://lore.kernel.org/linux-trace-kernel/20240222211442.634192653@goodmis.org/
Link: https://lore.kernel.org/linux-trace-kernel/20240516133454.681ba6a0@rorschach.local.home
Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Julia Lawall <Julia.Lawall@inria.fr>
Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
Acked-by: Jani Nikula <jani.nikula@intel.com>
Acked-by: Christian König <christian.koenig@amd.com> for the amdgpu parts.
Acked-by: Thomas Hellström <thomas.hellstrom@linux.intel.com> #for
Acked-by: Rafael J. Wysocki <rafael@kernel.org> # for thermal
Acked-by: Takashi Iwai <tiwai@suse.de>
Acked-by: Darrick J. Wong <djwong@kernel.org> # xfs
Tested-by: Guenter Roeck <linux@roeck-us.net>
119 lines
2.5 KiB
C
119 lines
2.5 KiB
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
#undef TRACE_SYSTEM
|
|
#define TRACE_SYSTEM qrtr
|
|
|
|
#if !defined(_TRACE_QRTR_H) || defined(TRACE_HEADER_MULTI_READ)
|
|
#define _TRACE_QRTR_H
|
|
|
|
#include <linux/qrtr.h>
|
|
#include <linux/tracepoint.h>
|
|
|
|
TRACE_EVENT(qrtr_ns_service_announce_new,
|
|
|
|
TP_PROTO(unsigned int service, unsigned int instance,
|
|
unsigned int node, unsigned int port),
|
|
|
|
TP_ARGS(service, instance, node, port),
|
|
|
|
TP_STRUCT__entry(
|
|
__field(unsigned int, service)
|
|
__field(unsigned int, instance)
|
|
__field(unsigned int, node)
|
|
__field(unsigned int, port)
|
|
),
|
|
|
|
TP_fast_assign(
|
|
__entry->service = service;
|
|
__entry->instance = instance;
|
|
__entry->node = node;
|
|
__entry->port = port;
|
|
),
|
|
|
|
TP_printk("advertising new server [%d:%x]@[%d:%d]",
|
|
__entry->service, __entry->instance, __entry->node,
|
|
__entry->port
|
|
)
|
|
);
|
|
|
|
TRACE_EVENT(qrtr_ns_service_announce_del,
|
|
|
|
TP_PROTO(unsigned int service, unsigned int instance,
|
|
unsigned int node, unsigned int port),
|
|
|
|
TP_ARGS(service, instance, node, port),
|
|
|
|
TP_STRUCT__entry(
|
|
__field(unsigned int, service)
|
|
__field(unsigned int, instance)
|
|
__field(unsigned int, node)
|
|
__field(unsigned int, port)
|
|
),
|
|
|
|
TP_fast_assign(
|
|
__entry->service = service;
|
|
__entry->instance = instance;
|
|
__entry->node = node;
|
|
__entry->port = port;
|
|
),
|
|
|
|
TP_printk("advertising removal of server [%d:%x]@[%d:%d]",
|
|
__entry->service, __entry->instance, __entry->node,
|
|
__entry->port
|
|
)
|
|
);
|
|
|
|
TRACE_EVENT(qrtr_ns_server_add,
|
|
|
|
TP_PROTO(unsigned int service, unsigned int instance,
|
|
unsigned int node, unsigned int port),
|
|
|
|
TP_ARGS(service, instance, node, port),
|
|
|
|
TP_STRUCT__entry(
|
|
__field(unsigned int, service)
|
|
__field(unsigned int, instance)
|
|
__field(unsigned int, node)
|
|
__field(unsigned int, port)
|
|
),
|
|
|
|
TP_fast_assign(
|
|
__entry->service = service;
|
|
__entry->instance = instance;
|
|
__entry->node = node;
|
|
__entry->port = port;
|
|
),
|
|
|
|
TP_printk("add server [%d:%x]@[%d:%d]",
|
|
__entry->service, __entry->instance, __entry->node,
|
|
__entry->port
|
|
)
|
|
);
|
|
|
|
TRACE_EVENT(qrtr_ns_message,
|
|
|
|
TP_PROTO(const char * const ctrl_pkt_str, __u32 sq_node, __u32 sq_port),
|
|
|
|
TP_ARGS(ctrl_pkt_str, sq_node, sq_port),
|
|
|
|
TP_STRUCT__entry(
|
|
__string(ctrl_pkt_str, ctrl_pkt_str)
|
|
__field(__u32, sq_node)
|
|
__field(__u32, sq_port)
|
|
),
|
|
|
|
TP_fast_assign(
|
|
__assign_str(ctrl_pkt_str);
|
|
__entry->sq_node = sq_node;
|
|
__entry->sq_port = sq_port;
|
|
),
|
|
|
|
TP_printk("%s from %d:%d",
|
|
__get_str(ctrl_pkt_str), __entry->sq_node, __entry->sq_port
|
|
)
|
|
);
|
|
|
|
#endif /* _TRACE_QRTR_H */
|
|
|
|
/* This part must be outside protection */
|
|
#include <trace/define_trace.h>
|