Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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.com


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent f04015ec

tools/lib/traceevent/plugin_hrtimer.c

+2 −17
Original line number Diff line number Diff line
@@ -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);