diff options
author | Jiri Olsa <jolsa@redhat.com> | 2013-12-03 08:09:38 -0500 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2013-12-04 13:36:50 -0500 |
commit | b32cea650a16092a654baa2095c78fa917bad4da (patch) | |
tree | 36239212833eb7d48968b3a5ce96e74c3cd0894c /tools/lib/traceevent | |
parent | f04015ecb5eb0bf25260de585f0c5f60e84f073a (diff) |
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 <rostedt@goodmis.org>
Signed-off-by: Jiri 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.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/lib/traceevent')
-rw-r--r-- | tools/lib/traceevent/plugin_hrtimer.c | 19 |
1 files 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, | |||
48 | struct pevent_record *record, | 48 | struct pevent_record *record, |
49 | struct event_format *event, void *context) | 49 | struct event_format *event, void *context) |
50 | { | 50 | { |
51 | struct pevent *pevent = event->pevent; | ||
52 | struct format_field *fn = pevent_find_field(event, "function"); | ||
53 | void *data = record->data; | ||
54 | |||
55 | trace_seq_printf(s, "hrtimer="); | 51 | trace_seq_printf(s, "hrtimer="); |
56 | 52 | ||
57 | if (pevent_print_num_field(s, "0x%llx", event, "timer", | 53 | if (pevent_print_num_field(s, "0x%llx", event, "timer", |
@@ -59,19 +55,8 @@ static int timer_start_handler(struct trace_seq *s, | |||
59 | pevent_print_num_field(s, "0x%llx", event, "hrtimer", | 55 | pevent_print_num_field(s, "0x%llx", event, "hrtimer", |
60 | record, 1); | 56 | record, 1); |
61 | 57 | ||
62 | if (!fn) { | 58 | pevent_print_func_field(s, " function=%s", event, "function", |
63 | trace_seq_printf(s, " function=MISSING"); | 59 | record, 0); |
64 | } else { | ||
65 | unsigned long long function; | ||
66 | const char *func; | ||
67 | |||
68 | if (pevent_read_number_field(fn, data, &function)) | ||
69 | trace_seq_printf(s, " function=INVALID"); | ||
70 | |||
71 | func = pevent_find_function(pevent, function); | ||
72 | |||
73 | trace_seq_printf(s, " function=%s", func); | ||
74 | } | ||
75 | 60 | ||
76 | trace_seq_printf(s, " expires="); | 61 | trace_seq_printf(s, " expires="); |
77 | pevent_print_num_field(s, "%llu", event, "expires", record, 1); | 62 | pevent_print_num_field(s, "%llu", event, "expires", record, 1); |