mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: tip-bot for Jiri Olsa <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: acme@redhat.com, linux-kernel@vger.kernel.org, paulus@samba.org,
	hpa@zytor.com, mingo@kernel.org, a.p.zijlstra@chello.nl,
	namhyung@kernel.org, jolsa@redhat.com, fweisbec@gmail.com,
	rostedt@goodmis.org, dsahern@gmail.com, tglx@linutronix.de,
	cjashfor@linux.vnet.ibm.com, mingo@elte.hu
Subject: [tip:perf/core] tools lib traceevent: Add hrtimer plugin
Date: Tue, 10 Dec 2013 01:19:26 -0800	[thread overview]
Message-ID: <tip-d9d13f8be6237950753e093683e9f415f31eccbc@git.kernel.org> (raw)
In-Reply-To: <1386076182-14484-14-git-send-email-jolsa@redhat.com>

Commit-ID:  d9d13f8be6237950753e093683e9f415f31eccbc
Gitweb:     http://git.kernel.org/tip/d9d13f8be6237950753e093683e9f415f31eccbc
Author:     Jiri Olsa <jolsa@redhat.com>
AuthorDate: Tue, 3 Dec 2013 14:09:27 +0100
Committer:  Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Wed, 4 Dec 2013 15:25:41 -0300

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: 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-14-git-send-email-jolsa@redhat.com
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/lib/traceevent/Makefile         |  3 +-
 tools/lib/traceevent/plugin_hrtimer.c | 93 +++++++++++++++++++++++++++++++++++
 2 files changed, 95 insertions(+), 1 deletion(-)

diff --git a/tools/lib/traceevent/Makefile b/tools/lib/traceevent/Makefile
index 6c65400..9ff2e25 100644
--- a/tools/lib/traceevent/Makefile
+++ b/tools/lib/traceevent/Makefile
@@ -212,7 +212,8 @@ PEVENT_LIB_OBJS += parse-filter.o
 PEVENT_LIB_OBJS += parse-utils.o
 PEVENT_LIB_OBJS += kbuffer-parse.o
 
-PLUGIN_OBJS = plugin_jbd2.o
+PLUGIN_OBJS  = plugin_jbd2.o
+PLUGIN_OBJS += plugin_hrtimer.o
 
 PLUGINS := $(PLUGIN_OBJS:.o=.so)
 
diff --git a/tools/lib/traceevent/plugin_hrtimer.c b/tools/lib/traceevent/plugin_hrtimer.c
new file mode 100644
index 0000000..e41d4cf
--- /dev/null
+++ b/tools/lib/traceevent/plugin_hrtimer.c
@@ -0,0 +1,93 @@
+/*
+ * 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;
+}

  reply	other threads:[~2013-12-10  9:20 UTC|newest]

Thread overview: 70+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-12-03 13:09 [PATCHv3 00/28] perf tools: Add traceevent plugins support Jiri Olsa
2013-12-03 13:09 ` [PATCH 01/28] perf tools: Remove stackprotector feature check Jiri Olsa
2013-12-10  9:16   ` [tip:perf/core] " tip-bot for Jiri Olsa
2013-12-03 13:09 ` [PATCH 02/28] tools lib traceevent: Add plugin support Jiri Olsa
2013-12-10  9:17   ` [tip:perf/core] " tip-bot for Jiri Olsa
2013-12-03 13:09 ` [PATCH 03/28] tools lib traceevent: Add plugin build support Jiri Olsa
2013-12-10  9:17   ` [tip:perf/core] " tip-bot for Jiri Olsa
2013-12-03 13:09 ` [PATCH 04/28] tools lib traceevent: Add traceevent_host_bigendian function Jiri Olsa
2013-12-10  9:17   ` [tip:perf/core] " tip-bot for Jiri Olsa
2013-12-03 13:09 ` [PATCH 05/28] tools lib traceevent: Change pevent_parse_format to include pevent handle Jiri Olsa
2013-12-10  9:18   ` [tip:perf/core] " tip-bot for Jiri Olsa
2013-12-03 13:09 ` [PATCH 06/28] tools lib traceevent: Harmonize the install messages in lib-traceevent Jiri Olsa
2013-12-10  9:18   ` [tip:perf/core] " tip-bot for Jiri Olsa
2013-12-03 13:09 ` [PATCH 07/28] perf tools: Add build and install plugins targets Jiri Olsa
2013-12-10  9:18   ` [tip:perf/core] " tip-bot for Jiri Olsa
2013-12-03 13:09 ` [PATCH 08/28] perf tools: Add filename__read_str util function Jiri Olsa
2013-12-10  9:18   ` [tip:perf/core] " tip-bot for Jiri Olsa
2013-12-03 13:09 ` [PATCH 09/28] perf tools: Add trace-event object Jiri Olsa
2013-12-10  9:18   ` [tip:perf/core] " tip-bot for Jiri Olsa
2013-12-03 13:09 ` [PATCH 10/28] perf tools: Add trace-event global object for tracepoint interface Jiri Olsa
2013-12-10  9:18   ` [tip:perf/core] " tip-bot for Jiri Olsa
2013-12-03 13:09 ` [PATCH 11/28] perf tools: Overload pr_stat traceevent print function Jiri Olsa
2013-12-10  9:19   ` [tip:perf/core] " tip-bot for Jiri Olsa
2013-12-03 13:09 ` [PATCH 12/28] tools lib traceevent: Add jbd2 plugin Jiri Olsa
2013-12-10  9:19   ` [tip:perf/core] " tip-bot for Jiri Olsa
2013-12-03 13:09 ` [PATCH 13/28] tools lib traceevent: Add hrtimer plugin Jiri Olsa
2013-12-10  9:19   ` tip-bot for Jiri Olsa [this message]
2013-12-03 13:09 ` [PATCH 14/28] tools lib traceevent: Add kmem plugin Jiri Olsa
2013-12-10  9:19   ` [tip:perf/core] " tip-bot for Jiri Olsa
2013-12-03 13:09 ` [PATCH 15/28] tools lib traceevent: Add kvm plugin Jiri Olsa
2013-12-10  9:19   ` [tip:perf/core] " tip-bot for Jiri Olsa
2013-12-03 13:09 ` [PATCH 16/28] tools lib traceevent: Add mac80211 plugin Jiri Olsa
2013-12-10  9:20   ` [tip:perf/core] " tip-bot for Jiri Olsa
2013-12-03 13:09 ` [PATCH 17/28] tools lib traceevent: Add sched_switch plugin Jiri Olsa
2013-12-10  9:20   ` [tip:perf/core] " tip-bot for Jiri Olsa
2013-12-03 13:09 ` [PATCH 18/28] tools lib traceevent: Add function plugin Jiri Olsa
2013-12-10  9:20   ` [tip:perf/core] " tip-bot for Jiri Olsa
2013-12-03 13:09 ` [PATCH 19/28] tools lib traceevent: Add xen plugin Jiri Olsa
2013-12-10  9:20   ` [tip:perf/core] " tip-bot for Jiri Olsa
2013-12-03 13:09 ` [PATCH 20/28] tools lib traceevent: Add scsi plugin Jiri Olsa
2013-12-10  9:20   ` [tip:perf/core] " tip-bot for Jiri Olsa
2013-12-03 13:09 ` [PATCH 21/28] tools lib traceevent: Add cfg80211 plugin Jiri Olsa
2013-12-10  9:21   ` [tip:perf/core] " tip-bot for Jiri Olsa
2013-12-03 13:09 ` [PATCH 22/28] tools lib traceevent: Remove malloc_or_die from event-plugin.c Jiri Olsa
2013-12-03 16:16   ` Steven Rostedt
2013-12-04  9:29     ` Jiri Olsa
2013-12-04 13:29       ` Arnaldo Carvalho de Melo
2013-12-04 13:51         ` Steven Rostedt
2013-12-10  9:21   ` [tip:perf/core] " tip-bot for Jiri Olsa
2013-12-03 13:09 ` [PATCH 23/28] tools lib traceevent: Use static functions in jbd2 plugin Jiri Olsa
2013-12-10  9:21   ` [tip:perf/core] " tip-bot for Jiri Olsa
2013-12-03 13:09 ` [PATCH 24/28] tools lib traceevent: Use pevent_print_func_field in hrtimer_start handler Jiri Olsa
2013-12-10  9:21   ` [tip:perf/core] " tip-bot for Jiri Olsa
2013-12-03 13:09 ` [PATCH 25/28] tools lib traceevent: Several cleanups for function plugin Jiri Olsa
2013-12-10  9:21   ` [tip:perf/core] " tip-bot for Jiri Olsa
2013-12-03 13:09 ` [PATCH 26/28] tools lib traceevent: Remove malloc_or_die from plugin_function.c Jiri Olsa
2013-12-10  9:21   ` [tip:perf/core] " tip-bot for Jiri Olsa
2013-12-03 13:09 ` [PATCH 27/28] tools lib traceevent: Update kvm plugin with is_writable_pte helper Jiri Olsa
2013-12-10  9:21   ` [tip:perf/core] " tip-bot for Jiri Olsa
2013-12-03 13:09 ` [PATCH 28/28] perf tools: Add udis86 disassembler feature check Jiri Olsa
2013-12-04 18:50   ` Arnaldo Carvalho de Melo
2013-12-04 18:53     ` Arnaldo Carvalho de Melo
2013-12-04 21:25       ` Jiri Olsa
2013-12-05  8:05     ` Jiri Olsa
2013-12-05  9:23       ` [PATCHv4 " Jiri Olsa
2013-12-05  9:25       ` [PATCH " Ingo Molnar
2013-12-05  9:41         ` Jiri Olsa
2013-12-05 10:45           ` Ingo Molnar
2013-12-05 13:02             ` Jiri Olsa
2013-12-10 15:31               ` Ingo Molnar

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=tip-d9d13f8be6237950753e093683e9f415f31eccbc@git.kernel.org \
    --to=tipbot@zytor.com \
    --cc=a.p.zijlstra@chello.nl \
    --cc=acme@redhat.com \
    --cc=cjashfor@linux.vnet.ibm.com \
    --cc=dsahern@gmail.com \
    --cc=fweisbec@gmail.com \
    --cc=hpa@zytor.com \
    --cc=jolsa@redhat.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tip-commits@vger.kernel.org \
    --cc=mingo@elte.hu \
    --cc=mingo@kernel.org \
    --cc=namhyung@kernel.org \
    --cc=paulus@samba.org \
    --cc=rostedt@goodmis.org \
    --cc=tglx@linutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

Powered by JetHome