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

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

tools lib traceevent: Add hrtimer plugin 

Backporting hrtimer plugin.

Backported from Steven Rostedt's trace-cmd repo (HEAD 0f2c2fb):
git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/trace-cmd.git



This plugin adds function field resolving for following tracepoint
events:

  timer:hrtimer_expire_entry
  timer:hrtimer_start

The diff of 'perf script' output generated by old and new code: (data
was generated by 'perf record -e 'timer:hrtimer*' -a')

  --- script.hrtimer.old
  +++ script.hrtimer.new
  -         swapper     0 [000] 27405.519092: timer:hrtimer_start: [FAILED TO PARSE] hrtimer=0xffff88021e20e800 function=0xffffffff810c0e10 expires=27398383000000 softexpires=27398383000000
  +         swapper     0 [000] 27405.519103: timer:hrtimer_start: hrtimer=0xffff88021e20e800 function=tick_sched_timer expires=27398383000000 softexpires=27398383000000
  -         swapper     0 [001] 27405.519544: timer:hrtimer_expire_entry: [FAILED TO PARSE] hrtimer=0xffff880211334058 now=27398294182491 function=0xffffffff81086f20
  +         swapper     0 [001] 27405.519544: timer:hrtimer_expire_entry: hrtimer=0xffff880211334058 now=27398294182491 function=posix_timer_fn/0x0

Check the 'function' field is translated into the function name.

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-14-git-send-email-jolsa@redhat.com


Signed-off-by: default avatarSteven Rostedt <rostedt@goodmis.org>
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent e0549f11

tools/lib/traceevent/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -213,6 +213,7 @@ PEVENT_LIB_OBJS += parse-utils.o 
PEVENT_LIB_OBJS += kbuffer-parse.o



PLUGIN_OBJS  = plugin_jbd2.o

PLUGIN_OBJS += plugin_hrtimer.o



PLUGINS := $(PLUGIN_OBJS:.o=.so)

tools/lib/traceevent/plugin_hrtimer.c

0 → 100644
+93 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2009 Red Hat Inc, Steven Rostedt <srostedt@redhat.com>

 * Copyright (C) 2009 Johannes Berg <johannes@sipsolutions.net>

 *

 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

 * This program is free software; you can redistribute it and/or

 * modify it under the terms of the GNU Lesser General Public

 * License as published by the Free Software Foundation;

 * version 2.1 of the License (not later!)

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU Lesser General Public License for more details.

 *

 * You should have received a copy of the GNU Lesser General Public

 * License along with this program; if not,  see <http://www.gnu.org/licenses>

 *

 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

 */

#include <stdio.h>

#include <stdlib.h>

#include <string.h>



#include "event-parse.h"



static int timer_expire_handler(struct trace_seq *s,

				struct pevent_record *record,

				struct event_format *event, void *context)

{

	trace_seq_printf(s, "hrtimer=");



	if (pevent_print_num_field(s, "0x%llx", event, "timer",

				   record, 0) == -1)

		pevent_print_num_field(s, "0x%llx", event, "hrtimer",

				       record, 1);



	trace_seq_printf(s, " now=");



	pevent_print_num_field(s, "%llu", event, "now", record, 1);



	pevent_print_func_field(s, " function=%s", event, "function",

				record, 0);

	return 0;

}



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",

				   record, 0) == -1)

		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);

	}



	trace_seq_printf(s, " expires=");

	pevent_print_num_field(s, "%llu", event, "expires", record, 1);



	trace_seq_printf(s, " softexpires=");

	pevent_print_num_field(s, "%llu", event, "softexpires", record, 1);

	return 0;

}



int PEVENT_PLUGIN_LOADER(struct pevent *pevent)

{

	pevent_register_event_handler(pevent, -1,

				      "timer", "hrtimer_expire_entry",

				      timer_expire_handler, NULL);



	pevent_register_event_handler(pevent, -1, "timer", "hrtimer_start",

				      timer_start_handler, NULL);

	return 0;

}