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 <[email protected]>
Signed-off-by: Jiri Olsa <[email protected]>
Cc: Corey Ashford <[email protected]>
Cc: David Ahern <[email protected]>
Cc: Frederic Weisbecker <[email protected]>
Cc: Ingo Molnar <[email protected]>
Cc: Namhyung Kim <[email protected]>
Cc: Paul Mackerras <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Cc: Steven Rostedt <[email protected]>
Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>

diff --git a/tools/lib/traceevent/plugin_hrtimer.c b/tools/lib/traceevent/plugin_hrtimer.c
index e41d4cf9344fa175cfb4fc1dac038324f4fada12..0b0ebf30aa44ee88906b39d054deaff86d983a5f 100644 (file)
--- 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);