Commit-ID:  b32cea650a16092a654baa2095c78fa917bad4da
Gitweb:     http://git.kernel.org/tip/b32cea650a16092a654baa2095c78fa917bad4da
Author:     Jiri Olsa <[email protected]>
AuthorDate: Tue, 3 Dec 2013 14:09:38 +0100
Committer:  Arnaldo Carvalho de Melo <[email protected]>
CommitDate: Wed, 4 Dec 2013 15:36:50 -0300

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]>
---
 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 e41d4cf..0b0ebf3 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);
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to