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 v12 13/16] perf probe: Support @BUILDID or @FILE suffix for SDT events
Date: Fri, 24 Jun 2016 18:07:34 +0900 [thread overview]
Message-ID: <20160624090734.25421.15.stgit@devbox> (raw)
In-Reply-To: <20160624090526.25421.24216.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) {
next prev parent reply other threads:[~2016-06-24 9:07 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-24 9:05 [PATCH perf/core v12 00/16] perf-probe --cache and SDT support Masami Hiramatsu
2016-06-24 9:05 ` [PATCH perf/core v12 01/16] perf probe: Use cache entry if possible Masami Hiramatsu
2016-06-24 9:05 ` [PATCH perf/core v12 02/16] perf probe: Show all cached probes Masami Hiramatsu
2016-06-24 9:05 ` [PATCH perf/core v12 03/16] perf probe: Remove caches when --cache is given Masami Hiramatsu
2016-06-24 9:06 ` [PATCH perf/core v12 04/16] perf/sdt: ELF support for SDT Masami Hiramatsu
2016-06-24 9:06 ` [PATCH perf/core v12 05/16] perf probe: Add group name support Masami Hiramatsu
2016-06-24 9:06 ` [PATCH perf/core v12 06/16] perf buildid-cache: Scan and import user SDT events to probe cache Masami Hiramatsu
2016-06-24 9:06 ` [PATCH perf/core v12 07/16] perf probe: Accept %sdt and %cached event name Masami Hiramatsu
2016-06-24 9:06 ` [PATCH perf/core v12 08/16] perf-list: Show SDT and pre-cached events Masami Hiramatsu
2016-07-14 7:07 ` [tip:perf/core] perf list: " tip-bot for Masami Hiramatsu
2016-06-24 9:06 ` [PATCH perf/core v12 09/16] perf-list: Skip SDTs placed in invalid binaries Masami Hiramatsu
2016-06-24 9:07 ` [PATCH perf/core v12 10/16] perf: probe-cache: Add for_each_probe_cache_entry() wrapper Masami Hiramatsu
2016-06-24 9:07 ` [PATCH perf/core v12 11/16] perf probe: Allow wildcard for cached events Masami Hiramatsu
2016-06-24 9:07 ` [PATCH perf/core v12 12/16] perf probe: Search SDT/cached event from all probe caches Masami Hiramatsu
2016-06-24 9:07 ` Masami Hiramatsu [this message]
2016-06-24 9:07 ` [PATCH perf/core v12 14/16] perf probe: Support a special SDT probe format Masami Hiramatsu
2016-06-24 9:07 ` [PATCH perf/core v12 15/16] perf build: Add sdt feature detection Masami Hiramatsu
2016-06-24 9:08 ` [PATCH perf/core v12 16/16] perf-test: Add a test case for SDT event Masami Hiramatsu
2016-06-24 20:25 ` [PATCH perf/core v12 00/16] perf-probe --cache and SDT support Brendan Gregg
2016-06-24 23:46 ` Masami Hiramatsu
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=20160624090734.25421.15.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.