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 v9 07/16] perf probe: Remove caches when --cache is given
Date: Sun, 29 May 2016 00:16:16 +0900 [thread overview]
Message-ID: <20160528151616.16098.88195.stgit@devbox> (raw)
In-Reply-To: <20160528151456.16098.90001.stgit@devbox>
From: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
perf-probe --del removes caches when --cache is given.
Note that the delete pattern is not same as normal events.
If you cached probes with event name, --del "eventname"
works as expected. However, if you skipped it, the cached
probes doesn't have actual event name. In that case
--del "probe-desc" is required (wildcard is acceptable).
For example a cache entry has the probe-desc "vfs_read $params",
you can remove it with --del 'vfs_read*'.
-----
# perf probe --cache --list
/[kernel.kallsyms] (1466a0a250b5d0070c6d0f03c5fed30b237970a1):
vfs_read $params
/usr/lib64/libc-2.17.so (c31ffe7942bfd77b2fca8f9bd5709d387a86d3bc):
getaddrinfo $params
# perf probe --cache --del vfs_read\*
Removed cached event: probe:vfs_read
# perf probe --cache --list
/[kernel.kallsyms] (1466a0a250b5d0070c6d0f03c5fed30b237970a1):
/usr/lib64/libc-2.17.so (c31ffe7942bfd77b2fca8f9bd5709d387a86d3bc):
getaddrinfo $params
-----
Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
---
Changes in v9:
- Fix to show which event is deleted (Thanks Hemant!)
Changes in v4:
- move del_perf_probe_caches() into builtin-probe.c since
command-line related delete procedure is there now.
---
tools/perf/Documentation/perf-probe.txt | 1 +
tools/perf/builtin-probe.c | 27 +++++++++++++++++++++++++
tools/perf/util/probe-file.c | 34 +++++++++++++++++++++++++------
tools/perf/util/probe-file.h | 2 ++
4 files changed, 57 insertions(+), 7 deletions(-)
diff --git a/tools/perf/Documentation/perf-probe.txt b/tools/perf/Documentation/perf-probe.txt
index 5a70d45..8d09173 100644
--- a/tools/perf/Documentation/perf-probe.txt
+++ b/tools/perf/Documentation/perf-probe.txt
@@ -116,6 +116,7 @@ OPTIONS
(With --add) Cache the probes. Any events which successfully added
are also stored in the cache file.
(With --list) Show cached probes.
+ (With --del) Remove cached probes.
--max-probes=NUM::
Set the maximum number of probe points for an event. Default is 128.
diff --git a/tools/perf/builtin-probe.c b/tools/perf/builtin-probe.c
index 53e380c0e..8f61525 100644
--- a/tools/perf/builtin-probe.c
+++ b/tools/perf/builtin-probe.c
@@ -363,6 +363,30 @@ out_cleanup:
return ret;
}
+static int del_perf_probe_caches(struct strfilter *filter)
+{
+ struct probe_cache *cache;
+ struct strlist *bidlist;
+ struct str_node *nd;
+ int ret;
+
+ ret = build_id_cache__list_all(&bidlist);
+ if (ret < 0) {
+ pr_debug("Failed to get buildids: %d\n", ret);
+ return ret;
+ }
+
+ strlist__for_each(nd, bidlist) {
+ cache = probe_cache__new(nd->s);
+ if (!cache)
+ continue;
+ probe_cache__remove_entries(cache, filter);
+ probe_cache__commit(cache);
+ probe_cache__delete(cache);
+ }
+ return 0;
+}
+
static int perf_del_probe_events(struct strfilter *filter)
{
int ret, ret2, ufd = -1, kfd = -1;
@@ -375,6 +399,9 @@ static int perf_del_probe_events(struct strfilter *filter)
pr_debug("Delete filter: \'%s\'\n", str);
+ if (probe_conf.cache)
+ return del_perf_probe_caches(filter);
+
/* Get current event names */
ret = probe_file__open_both(&kfd, &ufd, PF_FL_RW);
if (ret < 0)
diff --git a/tools/perf/util/probe-file.c b/tools/perf/util/probe-file.c
index a6d4a67..f687607 100644
--- a/tools/perf/util/probe-file.c
+++ b/tools/perf/util/probe-file.c
@@ -660,19 +660,39 @@ out:
return ret;
}
+static bool probe_cache_entry__compare(struct probe_cache_entry *entry,
+ struct strfilter *filter)
+{
+ char buf[128], *ptr = entry->spev;
+
+ if (entry->pev.event) {
+ snprintf(buf, 128, "%s:%s", entry->pev.group, entry->pev.event);
+ ptr = buf;
+ }
+ return strfilter__compare(filter, ptr);
+}
+
+int probe_cache__remove_entries(struct probe_cache *pcache,
+ struct strfilter *filter)
+{
+ struct probe_cache_entry *entry, *tmp;
+
+ list_for_each_entry_safe(entry, tmp, &pcache->list, list) {
+ if (probe_cache_entry__compare(entry, filter)) {
+ pr_info("Removed cached event: %s\n", entry->spev);
+ probe_cache_entry__delete(entry);
+ }
+ }
+ return 0;
+}
+
static int probe_cache__show_entries(struct probe_cache *pcache,
struct strfilter *filter)
{
struct probe_cache_entry *entry;
- char buf[128], *ptr;
list_for_each_entry(entry, &pcache->list, list) {
- if (entry->pev.event) {
- ptr = buf;
- snprintf(buf, 128, "%s:%s", entry->pev.group, entry->pev.event);
- } else
- ptr = entry->spev;
- if (strfilter__compare(filter, ptr))
+ if (probe_cache_entry__compare(entry, filter))
printf("%s\n", entry->spev);
}
return 0;
diff --git a/tools/perf/util/probe-file.h b/tools/perf/util/probe-file.h
index ac70446..e6fd9b9 100644
--- a/tools/perf/util/probe-file.h
+++ b/tools/perf/util/probe-file.h
@@ -37,6 +37,8 @@ int probe_cache__add_entry(struct probe_cache *pcache,
struct probe_trace_event *tevs, int ntevs);
int probe_cache__commit(struct probe_cache *pcache);
void probe_cache__delete(struct probe_cache *pcache);
+int probe_cache__remove_entries(struct probe_cache *pcache,
+ struct strfilter *filter);
struct probe_cache_entry *probe_cache__find(struct probe_cache *pcache,
struct perf_probe_event *pev);
struct probe_cache_entry *probe_cache__find_by_name(struct probe_cache *pcache,
next prev parent reply other threads:[~2016-05-28 15:16 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-28 15:15 [PATCH perf/core v9 00/16] perf-probe --cache and SDT support Masami Hiramatsu
2016-05-28 15:15 ` [PATCH perf/core v9 01/16] perf-symbol: Introduce filename__readable to check readability Masami Hiramatsu
2016-05-30 16:03 ` Arnaldo Carvalho de Melo
2016-05-30 16:04 ` Arnaldo Carvalho de Melo
2016-05-31 5:54 ` Masami Hiramatsu
2016-06-02 6:34 ` [tip:perf/core] perf symbols: " tip-bot for Masami Hiramatsu
2016-05-28 15:15 ` [PATCH perf/core v9 02/16] perf symbol: Cleanup the code flow of dso__find_kallsyms Masami Hiramatsu
2016-06-02 6:34 ` [tip:perf/core] perf symbols: " tip-bot for Masami Hiramatsu
2016-05-28 15:15 ` [PATCH perf/core v9 03/16] perf-buildid-cache: Use path/to/bin/buildid/elf instead of path/to/bin/buildid Masami Hiramatsu
2016-06-02 6:35 ` [tip:perf/core] perf buildid-cache: " tip-bot for Masami Hiramatsu
2016-05-28 15:15 ` [PATCH perf/core v9 04/16] perf probe: Add --cache option to cache the probe definitions Masami Hiramatsu
2016-05-28 15:15 ` [PATCH perf/core v9 05/16] perf probe: Use cache entry if possible Masami Hiramatsu
2016-05-28 15:16 ` [PATCH perf/core v9 06/16] perf probe: Show all cached probes Masami Hiramatsu
2016-05-28 15:16 ` Masami Hiramatsu [this message]
2016-05-28 15:16 ` [PATCH perf/core v9 08/16] perf/sdt: ELF support for SDT Masami Hiramatsu
2016-05-28 15:16 ` [PATCH perf/core v9 09/16] perf probe: Add group name support Masami Hiramatsu
2016-05-28 15:16 ` [PATCH perf/core v9 10/16] perf buildid-cache: Scan and import user SDT events to probe cache Masami Hiramatsu
2016-05-28 15:16 ` [PATCH perf/core v9 11/16] perf probe: Accept %sdt and %cached event name Masami Hiramatsu
2016-05-28 15:17 ` [PATCH perf/core v9 12/16] perf-list: Show SDT and pre-cached events Masami Hiramatsu
2016-05-28 15:17 ` [PATCH perf/core v9 13/16] perf-list: Skip SDTs placed in invalid binaries Masami Hiramatsu
2016-05-28 15:17 ` [PATCH perf/core v9 14/16] perf probe: Allow wildcard for cached events Masami Hiramatsu
2016-05-28 15:17 ` [PATCH perf/core v9 15/16] perf probe: Support @BUILDID or @FILE suffix for SDT events Masami Hiramatsu
2016-05-28 15:17 ` [PATCH perf/core v9 16/16] perf probe: Support a special SDT probe format Masami Hiramatsu
2016-05-30 3:54 ` [PATCH perf/core v9 00/16] perf-probe --cache and SDT support Namhyung Kim
2016-05-30 14:31 ` Masami Hiramatsu
2016-05-30 16:10 ` Arnaldo Carvalho de Melo
2016-05-31 9:01 ` Masami Hiramatsu
2016-05-31 13:40 ` Arnaldo Carvalho de Melo
2016-05-30 16:22 ` Arnaldo Carvalho de Melo
2016-05-30 16:30 ` Arnaldo Carvalho de Melo
2016-05-31 8:00 ` Masami Hiramatsu
2016-05-31 13:39 ` Arnaldo Carvalho de Melo
2016-05-31 16:30 ` Hemant Kumar
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=20160528151616.16098.88195.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).