tracing: probeevent: Cleanup argument field definition
Cleanup event argument definition code in one place for maintenancability. Link: http://lkml.kernel.org/r/152465862529.26224.9068605421476018902.stgit@devbox Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org> Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
This commit is contained in:

committed by
Steven Rostedt (VMware)

parent
56de763052
commit
eeb07b0615
@@ -1192,49 +1192,25 @@ print_kretprobe_event(struct trace_iterator *iter, int flags,
|
||||
|
||||
static int kprobe_event_define_fields(struct trace_event_call *event_call)
|
||||
{
|
||||
int ret, i;
|
||||
int ret;
|
||||
struct kprobe_trace_entry_head field;
|
||||
struct trace_kprobe *tk = (struct trace_kprobe *)event_call->data;
|
||||
|
||||
DEFINE_FIELD(unsigned long, ip, FIELD_STRING_IP, 0);
|
||||
/* Set argument names as fields */
|
||||
for (i = 0; i < tk->tp.nr_args; i++) {
|
||||
struct probe_arg *parg = &tk->tp.args[i];
|
||||
|
||||
ret = trace_define_field(event_call, parg->type->fmttype,
|
||||
parg->name,
|
||||
sizeof(field) + parg->offset,
|
||||
parg->type->size,
|
||||
parg->type->is_signed,
|
||||
FILTER_OTHER);
|
||||
if (ret)
|
||||
return ret;
|
||||
}
|
||||
return 0;
|
||||
return traceprobe_define_arg_fields(event_call, sizeof(field), &tk->tp);
|
||||
}
|
||||
|
||||
static int kretprobe_event_define_fields(struct trace_event_call *event_call)
|
||||
{
|
||||
int ret, i;
|
||||
int ret;
|
||||
struct kretprobe_trace_entry_head field;
|
||||
struct trace_kprobe *tk = (struct trace_kprobe *)event_call->data;
|
||||
|
||||
DEFINE_FIELD(unsigned long, func, FIELD_STRING_FUNC, 0);
|
||||
DEFINE_FIELD(unsigned long, ret_ip, FIELD_STRING_RETIP, 0);
|
||||
/* Set argument names as fields */
|
||||
for (i = 0; i < tk->tp.nr_args; i++) {
|
||||
struct probe_arg *parg = &tk->tp.args[i];
|
||||
|
||||
ret = trace_define_field(event_call, parg->type->fmttype,
|
||||
parg->name,
|
||||
sizeof(field) + parg->offset,
|
||||
parg->type->size,
|
||||
parg->type->is_signed,
|
||||
FILTER_OTHER);
|
||||
if (ret)
|
||||
return ret;
|
||||
}
|
||||
return 0;
|
||||
return traceprobe_define_arg_fields(event_call, sizeof(field), &tk->tp);
|
||||
}
|
||||
|
||||
#ifdef CONFIG_PERF_EVENTS
|
||||
|
Reference in New Issue
Block a user