Commit e8f9f4d7 authored by Frederic Weisbecker's avatar Frederic Weisbecker
Browse files

tracing: Add ftrace event call parameter to its field descriptor handler



Add the struct ftrace_event_call as a parameter of its show_format()
callback. This way we can use it from the syscall trace events to
retrieve the syscall name from the ftrace event call parameter and
describe its fields using the syscalls metadata.
Signed-off-by: default avatarFrederic Weisbecker <fweisbec@gmail.com>
Cc: Lai Jiangshan <laijs@cn.fujitsu.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
Cc: Jiaying Zhang <jiayingz@google.com>
Cc: Martin Bligh <mbligh@google.com>
Cc: Li Zefan <lizf@cn.fujitsu.com>
Cc: Masami Hiramatsu <mhiramat@redhat.com>
Cc: Jason Baron <jbaron@redhat.com>
parent 0ac676fb
...@@ -116,7 +116,8 @@ struct ftrace_event_call { ...@@ -116,7 +116,8 @@ struct ftrace_event_call {
void (*unregfunc)(void *); void (*unregfunc)(void *);
int id; int id;
int (*raw_init)(void); int (*raw_init)(void);
int (*show_format)(struct trace_seq *s); int (*show_format)(struct ftrace_event_call *call,
struct trace_seq *s);
int (*define_fields)(void); int (*define_fields)(void);
struct list_head fields; struct list_head fields;
int filter_active; int filter_active;
......
...@@ -151,7 +151,8 @@ ...@@ -151,7 +151,8 @@
#undef TRACE_EVENT #undef TRACE_EVENT
#define TRACE_EVENT(call, proto, args, tstruct, func, print) \ #define TRACE_EVENT(call, proto, args, tstruct, func, print) \
static int \ static int \
ftrace_format_##call(struct trace_seq *s) \ ftrace_format_##call(struct ftrace_event_call *unused, \
struct trace_seq *s) \
{ \ { \
struct ftrace_raw_##call field __attribute__((unused)); \ struct ftrace_raw_##call field __attribute__((unused)); \
int ret = 0; \ int ret = 0; \
......
...@@ -576,7 +576,7 @@ event_format_read(struct file *filp, char __user *ubuf, size_t cnt, ...@@ -576,7 +576,7 @@ event_format_read(struct file *filp, char __user *ubuf, size_t cnt,
trace_seq_printf(s, "format:\n"); trace_seq_printf(s, "format:\n");
trace_write_header(s); trace_write_header(s);
r = call->show_format(s); r = call->show_format(call, s);
if (!r) { if (!r) {
/* /*
* ug! The format output is bigger than a PAGE!! * ug! The format output is bigger than a PAGE!!
......
...@@ -60,7 +60,8 @@ extern void __bad_type_size(void); ...@@ -60,7 +60,8 @@ extern void __bad_type_size(void);
#undef TRACE_EVENT_FORMAT #undef TRACE_EVENT_FORMAT
#define TRACE_EVENT_FORMAT(call, proto, args, fmt, tstruct, tpfmt) \ #define TRACE_EVENT_FORMAT(call, proto, args, fmt, tstruct, tpfmt) \
static int \ static int \
ftrace_format_##call(struct trace_seq *s) \ ftrace_format_##call(struct ftrace_event_call *unused, \
struct trace_seq *s) \
{ \ { \
struct args field; \ struct args field; \
int ret; \ int ret; \
...@@ -76,7 +77,8 @@ ftrace_format_##call(struct trace_seq *s) \ ...@@ -76,7 +77,8 @@ ftrace_format_##call(struct trace_seq *s) \
#define TRACE_EVENT_FORMAT_NOFILTER(call, proto, args, fmt, tstruct, \ #define TRACE_EVENT_FORMAT_NOFILTER(call, proto, args, fmt, tstruct, \
tpfmt) \ tpfmt) \
static int \ static int \
ftrace_format_##call(struct trace_seq *s) \ ftrace_format_##call(struct ftrace_event_call *unused, \
struct trace_seq *s) \
{ \ { \
struct args field; \ struct args field; \
int ret; \ int ret; \
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment