Commit b32cea65 authored by Jiri Olsa's avatar Jiri Olsa Committed by Arnaldo Carvalho de Melo

tools lib traceevent: Use pevent_print_func_field in hrtimer_start handler

The pevent_print_func_field function encompasses all the functionality
used in the hrtimer_start handler. Change the handler to use this
function.

This also unifies the function field output with the
hrtimer_expire_entry handler.
Suggested-by: default avatarSteven Rostedt <rostedt@goodmis.org>
Signed-off-by: default avatarJiri Olsa <jolsa@redhat.com>
Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Steven Rostedt <rostedt@goodmis.org>
Link: http://lkml.kernel.org/r/1386076182-14484-25-git-send-email-jolsa@redhat.comSigned-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent f04015ec
...@@ -48,10 +48,6 @@ static int timer_start_handler(struct trace_seq *s, ...@@ -48,10 +48,6 @@ static int timer_start_handler(struct trace_seq *s,
struct pevent_record *record, struct pevent_record *record,
struct event_format *event, void *context) struct event_format *event, void *context)
{ {
struct pevent *pevent = event->pevent;
struct format_field *fn = pevent_find_field(event, "function");
void *data = record->data;
trace_seq_printf(s, "hrtimer="); trace_seq_printf(s, "hrtimer=");
if (pevent_print_num_field(s, "0x%llx", event, "timer", if (pevent_print_num_field(s, "0x%llx", event, "timer",
...@@ -59,19 +55,8 @@ static int timer_start_handler(struct trace_seq *s, ...@@ -59,19 +55,8 @@ static int timer_start_handler(struct trace_seq *s,
pevent_print_num_field(s, "0x%llx", event, "hrtimer", pevent_print_num_field(s, "0x%llx", event, "hrtimer",
record, 1); record, 1);
if (!fn) { pevent_print_func_field(s, " function=%s", event, "function",
trace_seq_printf(s, " function=MISSING"); record, 0);
} else {
unsigned long long function;
const char *func;
if (pevent_read_number_field(fn, data, &function))
trace_seq_printf(s, " function=INVALID");
func = pevent_find_function(pevent, function);
trace_seq_printf(s, " function=%s", func);
}
trace_seq_printf(s, " expires="); trace_seq_printf(s, " expires=");
pevent_print_num_field(s, "%llu", event, "expires", record, 1); pevent_print_num_field(s, "%llu", event, "expires", record, 1);
......
Markdown is supported
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