From b32cea650a16092a654baa2095c78fa917bad4da Mon Sep 17 00:00:00 2001 From: Jiri Olsa Date: Tue, 3 Dec 2013 14:09:38 +0100 Subject: [PATCH] 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: Steven Rostedt Signed-off-by: Jiri Olsa Cc: Corey Ashford Cc: David Ahern Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Namhyung Kim Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Steven Rostedt Link: http://lkml.kernel.org/r/1386076182-14484-25-git-send-email-jolsa@redhat.com Signed-off-by: Arnaldo Carvalho de Melo --- tools/lib/traceevent/plugin_hrtimer.c | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/tools/lib/traceevent/plugin_hrtimer.c b/tools/lib/traceevent/plugin_hrtimer.c index e41d4cf9344f..0b0ebf30aa44 100644 --- a/tools/lib/traceevent/plugin_hrtimer.c +++ b/tools/lib/traceevent/plugin_hrtimer.c @@ -48,10 +48,6 @@ static int timer_start_handler(struct trace_seq *s, struct pevent_record *record, 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="); if (pevent_print_num_field(s, "0x%llx", event, "timer", @@ -59,19 +55,8 @@ static int timer_start_handler(struct trace_seq *s, pevent_print_num_field(s, "0x%llx", event, "hrtimer", record, 1); - if (!fn) { - trace_seq_printf(s, " function=MISSING"); - } 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); - } + pevent_print_func_field(s, " function=%s", event, "function", + record, 0); trace_seq_printf(s, " expires="); pevent_print_num_field(s, "%llu", event, "expires", record, 1); -- 2.30.2