All of lore.kernel.org
 help / color / mirror / Atom feed
From: Masami Hiramatsu <mhiramat@kernel.org>
To: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: Masami Hiramatsu <mhiramat@kernel.org>,
	linux-kernel@vger.kernel.org, Namhyung Kim <namhyung@kernel.org>,
	Peter Zijlstra <peterz@infradead.org>,
	Ingo Molnar <mingo@redhat.com>,
	Hemant Kumar <hemant@linux.vnet.ibm.com>,
	Ananth N Mavinakayanahalli <ananth@linux.vnet.ibm.com>,
	Brendan Gregg <brendan.d.gregg@gmail.com>
Subject: [PATCH perf/core v13 12/15] perf probe: Support @BUILDID or @FILE suffix for SDT events
Date: Fri,  1 Jul 2016 17:05:07 +0900	[thread overview]
Message-ID: <146736030745.27797.1072376793846895469.stgit@devbox> (raw)
In-Reply-To: <146736018054.27797.14439910564760436056.stgit@devbox>

Support @BUILDID or @FILE suffix for SDT events. This allows
perf to add probes on SDTs/pre-cached events on given FILE
or the file which has given BUILDID (also, this complements
BUILDID.)
For example, both gcc and libstdc++ has same SDTs as below.
If you would like to add a probe on sdt_libstdcxx:catch on gcc,
you can do as below.

  ----
  # perf list sdt | tail -n 6
    sdt_libstdcxx:catch@/usr/bin/gcc(0cc207fc4b27)     [SDT event]
    sdt_libstdcxx:catch@/usr/lib64/libstdc++.so.6.0.20(91c7a88fdf49)
    sdt_libstdcxx:rethrow@/usr/bin/gcc(0cc207fc4b27)   [SDT event]
    sdt_libstdcxx:rethrow@/usr/lib64/libstdc++.so.6.0.20(91c7a88fdf49)
    sdt_libstdcxx:throw@/usr/bin/gcc(0cc207fc4b27)     [SDT event]
    sdt_libstdcxx:throw@/usr/lib64/libstdc++.so.6.0.20(91c7a88fdf49)
  # perf probe -a %sdt_libstdcxx:catch@0cc
  Added new event:
    sdt_libstdcxx:catch  (on %catch in /usr/bin/gcc)

  You can now use it in all perf tools, such as:

  	perf record -e sdt_libstdcxx:catch -aR sleep 1
  ----

Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
---
 Changes in v12:
  - Rename strlist__for_each to strlist__for_each_entry.
---
 tools/perf/util/build-id.c    |   43 +++++++++++++++++++++++++++++++++++++++++
 tools/perf/util/build-id.h    |    1 +
 tools/perf/util/probe-event.c |   17 ++++++++++++++--
 3 files changed, 59 insertions(+), 2 deletions(-)

diff --git a/tools/perf/util/build-id.c b/tools/perf/util/build-id.c
index 8e86a83..e59003e 100644
--- a/tools/perf/util/build-id.c
+++ b/tools/perf/util/build-id.c
@@ -523,6 +523,49 @@ err_out:
 	goto out_free;
 }
 
+static bool str_is_build_id(const char *maybe_sbuild_id, size_t len)
+{
+	size_t i;
+
+	for (i = 0; i < len; i++) {
+		if (!isxdigit(maybe_sbuild_id[i]))
+			return false;
+	}
+	return true;
+}
+
+/* Return the valid complete build-id */
+char *build_id_cache__complement(const char *incomplete_sbuild_id)
+{
+	struct strlist *bidlist;
+	struct str_node *nd, *cand = NULL;
+	char *sbuild_id = NULL;
+	size_t len = strlen(incomplete_sbuild_id);
+
+	if (len >= SBUILD_ID_SIZE ||
+	    !str_is_build_id(incomplete_sbuild_id, len))
+		return NULL;
+
+	bidlist = build_id_cache__list_all(true);
+	if (!bidlist)
+		return NULL;
+
+	strlist__for_each_entry(nd, bidlist) {
+		if (strncmp(nd->s, incomplete_sbuild_id, len) != 0)
+			continue;
+		if (cand) {	/* Error: There are more than 2 candidates. */
+			cand = NULL;
+			break;
+		}
+		cand = nd;
+	}
+	if (cand)
+		sbuild_id = strdup(cand->s);
+	strlist__delete(bidlist);
+
+	return sbuild_id;
+}
+
 char *build_id_cache__cachedir(const char *sbuild_id, const char *name,
 			       bool is_kallsyms, bool is_vdso)
 {
diff --git a/tools/perf/util/build-id.h b/tools/perf/util/build-id.h
index 64e740f..d279906 100644
--- a/tools/perf/util/build-id.h
+++ b/tools/perf/util/build-id.h
@@ -35,6 +35,7 @@ char *build_id_cache__linkname(const char *sbuild_id, char *bf, size_t size);
 char *build_id_cache__cachedir(const char *sbuild_id, const char *name,
 			       bool is_kallsyms, bool is_vdso);
 struct strlist *build_id_cache__list_all(bool validonly);
+char *build_id_cache__complement(const char *incomplete_sbuild_id);
 int build_id_cache__list_build_ids(const char *pathname,
 				   struct strlist **result);
 bool build_id_cache__cached(const char *sbuild_id);
diff --git a/tools/perf/util/probe-event.c b/tools/perf/util/probe-event.c
index 8816643..b38548c 100644
--- a/tools/perf/util/probe-event.c
+++ b/tools/perf/util/probe-event.c
@@ -1251,8 +1251,21 @@ static int parse_perf_probe_point(char *arg, struct perf_probe_event *pev)
 	ptr = strpbrk(arg, ";=@+%");
 	if (pev->sdt) {
 		if (ptr) {
-			semantic_error("%s must contain only an SDT event name.\n", arg);
-			return -EINVAL;
+			if (*ptr != '@') {
+				semantic_error("%s must be an SDT name.\n",
+					       arg);
+				return -EINVAL;
+			}
+			/* This must be a target file name or build id */
+			tmp = build_id_cache__complement(ptr + 1);
+			if (tmp) {
+				pev->target = build_id_cache__origname(tmp);
+				free(tmp);
+			} else
+				pev->target = strdup(ptr + 1);
+			if (!pev->target)
+				return -ENOMEM;
+			*ptr = '\0';
 		}
 		ret = parse_perf_probe_event_name(&arg, pev);
 		if (ret == 0) {

  parent reply	other threads:[~2016-07-01  8:05 UTC|newest]

Thread overview: 32+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-07-01  8:03 [PATCH perf/core v13 00/15] perf-probe --cache and SDT support Masami Hiramatsu
2016-07-01  8:03 ` [PATCH perf/core v13 01/15] perf probe: Use cache entry if possible Masami Hiramatsu
2016-07-01 13:20   ` Arnaldo Carvalho de Melo
2016-07-05 10:16   ` [tip:perf/core] " tip-bot for Masami Hiramatsu
2016-07-01  8:03 ` [PATCH perf/core v13 02/15] perf probe: Show all cached probes Masami Hiramatsu
2016-07-01 13:51   ` Arnaldo Carvalho de Melo
2016-07-04  2:03     ` Masami Hiramatsu
2016-07-04  2:06       ` [PATCH perf/core] [BUGFIX] perf-probe: Fix to show correct error message for $vars and $params Masami Hiramatsu
2016-07-05 10:17   ` [tip:perf/core] perf probe: Show all cached probes tip-bot for Masami Hiramatsu
2016-07-01  8:03 ` [PATCH perf/core v13 03/15] perf probe: Remove caches when --cache is given Masami Hiramatsu
2016-07-05 10:17   ` [tip:perf/core] " tip-bot for Masami Hiramatsu
2016-07-01  8:03 ` [PATCH perf/core v13 04/15] perf/sdt: ELF support for SDT Masami Hiramatsu
2016-07-01 18:56   ` Arnaldo Carvalho de Melo
2016-07-04  5:25     ` Masami Hiramatsu
2016-07-05 10:18   ` [tip:perf/core] perf sdt: " tip-bot for Hemant Kumar
2016-07-01  8:04 ` [PATCH perf/core v13 05/15] perf probe: Add group name support Masami Hiramatsu
2016-07-05 10:19   ` [tip:perf/core] " tip-bot for Masami Hiramatsu
2016-07-01  8:04 ` [PATCH perf/core v13 06/15] perf buildid-cache: Scan and import user SDT events to probe cache Masami Hiramatsu
2016-07-01 18:22   ` Arnaldo Carvalho de Melo
2016-07-04  2:15     ` Masami Hiramatsu
2016-07-05  2:08     ` Masami Hiramatsu
2016-07-05 10:19   ` [tip:perf/core] " tip-bot for Masami Hiramatsu
2016-07-01  8:04 ` [PATCH perf/core v13 07/15] perf probe: Accept %sdt and %cached event name Masami Hiramatsu
2016-07-01  8:04 ` [PATCH perf/core v13 08/15] perf-probe: Make --list shows only available cached events Masami Hiramatsu
2016-07-01  8:04 ` [PATCH perf/core v13 09/15] perf: probe-cache: Add for_each_probe_cache_entry() wrapper Masami Hiramatsu
2016-07-01  8:04 ` [PATCH perf/core v13 10/15] perf probe: Allow wildcard for cached events Masami Hiramatsu
2016-07-01  8:04 ` [PATCH perf/core v13 11/15] perf probe: Search SDT/cached event from all probe caches Masami Hiramatsu
2016-07-01  8:05 ` Masami Hiramatsu [this message]
2016-07-01  8:05 ` [PATCH perf/core v13 13/15] perf probe: Support a special SDT probe format Masami Hiramatsu
2016-07-01  8:05 ` [PATCH perf/core v13 14/15] perf build: Add sdt feature detection Masami Hiramatsu
2016-07-01  8:05 ` [PATCH perf/core v13 15/15] perf-test: Add a test case for SDT event Masami Hiramatsu
2016-07-01 13:19 ` [PATCH perf/core v13 00/15] perf-probe --cache and SDT support Arnaldo Carvalho de Melo

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=146736030745.27797.1072376793846895469.stgit@devbox \
    --to=mhiramat@kernel.org \
    --cc=acme@kernel.org \
    --cc=ananth@linux.vnet.ibm.com \
    --cc=brendan.d.gregg@gmail.com \
    --cc=hemant@linux.vnet.ibm.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@redhat.com \
    --cc=namhyung@kernel.org \
    --cc=peterz@infradead.org \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.