From: tip-bot for Masami Hiramatsu <mhiramat@redhat.com>
To: linux-tip-commits@vger.kernel.org
Cc: acme@redhat.com, mingo@redhat.com, peterz@infradead.org,
fweisbec@gmail.com, dle-develop@lists.sourceforge.net,
rostedt@goodmis.org, jbaron@redhat.com,
tglx@linutronix.de, mhiramat@redhat.com,
systemtap@sources.redhat.com,
linux-kernel@vger.kernel.org, hpa@zytor.com,
paulus@samba.org, fche@redhat.com, jkenisto@us.ibm.com,
hch@infradead.org, ananth@in.ibm.com,
srikar@linux.vnet.ibm.com, mingo@elte.hu,
prasad@linux.vnet.ibm.com
Subject: [tip:perf/urgent] perf probe: Fix --del to update current event list
Date: Tue, 15 Dec 2009 19:29:00 -0000 [thread overview]
Message-ID: <tip-3e3405906dab00afecd5a16871850a088eba4626@git.kernel.org> (raw)
In-Reply-To: <20091215153149.17436.61265.stgit@dhcp-100-2-132.bos.redhat.com>
Commit-ID: 3e3405906dab00afecd5a16871850a088eba4626
Gitweb: http://git.kernel.org/tip/3e3405906dab00afecd5a16871850a088eba4626
Author: Masami Hiramatsu <mhiramat@redhat.com>
AuthorDate: Tue, 15 Dec 2009 10:31:49 -0500
Committer: Ingo Molnar <mingo@elte.hu>
CommitDate: Tue, 15 Dec 2009 20:22:01 +0100
perf probe: Fix --del to update current event list
Fix --del option to update current existing event list
after perf probe deleted an event.
Signed-off-by: Masami Hiramatsu <mhiramat@redhat.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Jim Keniston <jkenisto@us.ibm.com>
Cc: Ananth N Mavinakayanahalli <ananth@in.ibm.com>
Cc: Christoph Hellwig <hch@infradead.org>
Cc: Frank Ch. Eigler <fche@redhat.com>
Cc: Jason Baron <jbaron@redhat.com>
Cc: K.Prasad <prasad@linux.vnet.ibm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
Cc: systemtap <systemtap@sources.redhat.com>
Cc: DLE <dle-develop@lists.sourceforge.net>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
LKML-Reference: <20091215153149.17436.61265.stgit@dhcp-100-2-132.bos.redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---
tools/perf/util/probe-event.c | 5 ++++-
tools/perf/util/strlist.c | 6 +++---
tools/perf/util/strlist.h | 7 ++++++-
3 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/tools/perf/util/probe-event.c b/tools/perf/util/probe-event.c
index 1eacee6..eab25d6 100644
--- a/tools/perf/util/probe-event.c
+++ b/tools/perf/util/probe-event.c
@@ -540,10 +540,12 @@ static void del_trace_kprobe_event(int fd, const char *group,
const char *event, struct strlist *namelist)
{
char buf[128];
+ struct str_node *ent;
if (e_snprintf(buf, 128, "%s:%s", group, event) < 0)
die("Failed to copy event.");
- if (!strlist__has_entry(namelist, buf)) {
+ ent = strlist__find(namelist, buf);
+ if (!ent) {
pr_info("Info: event \"%s\" does not exist, could not remove it.\n", buf);
return;
}
@@ -553,6 +555,7 @@ static void del_trace_kprobe_event(int fd, const char *group,
write_trace_kprobe_event(fd, buf);
printf("Remove event: %s:%s\n", group, event);
+ strlist__remove(namelist, ent);
}
void del_trace_kprobe_events(struct strlist *dellist)
diff --git a/tools/perf/util/strlist.c b/tools/perf/util/strlist.c
index 7ad3817..6783a20 100644
--- a/tools/perf/util/strlist.c
+++ b/tools/perf/util/strlist.c
@@ -102,7 +102,7 @@ void strlist__remove(struct strlist *self, struct str_node *sn)
str_node__delete(sn, self->dupstr);
}
-bool strlist__has_entry(struct strlist *self, const char *entry)
+struct str_node *strlist__find(struct strlist *self, const char *entry)
{
struct rb_node **p = &self->entries.rb_node;
struct rb_node *parent = NULL;
@@ -120,10 +120,10 @@ bool strlist__has_entry(struct strlist *self, const char *entry)
else if (rc < 0)
p = &(*p)->rb_right;
else
- return true;
+ return sn;
}
- return false;
+ return NULL;
}
static int strlist__parse_list_entry(struct strlist *self, const char *s)
diff --git a/tools/perf/util/strlist.h b/tools/perf/util/strlist.h
index cb46593..59091c7 100644
--- a/tools/perf/util/strlist.h
+++ b/tools/perf/util/strlist.h
@@ -23,7 +23,12 @@ int strlist__load(struct strlist *self, const char *filename);
int strlist__add(struct strlist *self, const char *str);
struct str_node *strlist__entry(const struct strlist *self, unsigned int idx);
-bool strlist__has_entry(struct strlist *self, const char *entry);
+struct str_node *strlist__find(struct strlist *self, const char *entry);
+
+static inline bool strlist__has_entry(struct strlist *self, const char *entry)
+{
+ return strlist__find(self, entry) != NULL;
+}
static inline bool strlist__empty(const struct strlist *self)
{
next prev parent reply other threads:[~2009-12-15 19:29 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-12-15 15:26 [PATCH -tip 00/14] perf-probe updates Masami Hiramatsu
2009-12-15 15:26 ` [PATCH -tip 01/14] perf probe: Cleanup struct session in builtin-probe.c Masami Hiramatsu
2009-12-15 19:27 ` [tip:perf/urgent] " tip-bot for Masami Hiramatsu
2009-12-15 15:26 ` [PATCH -tip 02/14] perf probe: Check the result of e_snprintf() Masami Hiramatsu
2009-12-15 19:26 ` [tip:perf/urgent] " tip-bot for Masami Hiramatsu
2009-12-15 15:27 ` [PATCH -tip 04/14] perf probe: Show need-dwarf message only if it is really needed Masami Hiramatsu
2009-12-15 19:27 ` [tip:perf/urgent] " tip-bot for Masami Hiramatsu
2009-12-15 15:27 ` [PATCH -tip 07/14] perf tools: Add for_each macros for strlist Masami Hiramatsu
2009-12-15 19:28 ` [tip:perf/urgent] " tip-bot for Masami Hiramatsu
2009-12-15 15:27 ` [PATCH -tip 09/14] perf probe: Add glob matching support on --del Masami Hiramatsu
2009-12-15 19:28 ` [tip:perf/urgent] " tip-bot for Masami Hiramatsu
2009-12-15 15:27 ` [PATCH -tip 05/14] perf probe: Fix --del to show info instead of warning Masami Hiramatsu
2009-12-15 19:29 ` [tip:perf/urgent] " tip-bot for Masami Hiramatsu
2009-12-15 15:27 ` [PATCH -tip 06/14] perf probe: Fix --del to update current event list Masami Hiramatsu
2009-12-15 19:29 ` tip-bot for Masami Hiramatsu [this message]
2009-12-15 15:27 ` [PATCH -tip 03/14] perf probe: Check hyphen only argument Masami Hiramatsu
2009-12-15 19:29 ` [tip:perf/urgent] " tip-bot for Masami Hiramatsu
2009-12-15 15:27 ` [PATCH -tip 08/14] perf probe: Use strlist__for_each macros in probe-event.c Masami Hiramatsu
2009-12-15 19:28 ` [tip:perf/urgent] " tip-bot for Masami Hiramatsu
2009-12-15 15:28 ` [PATCH -tip 10/14] perf probe: Support event name for --add option Masami Hiramatsu
2009-12-15 19:54 ` [tip:perf/urgent] " tip-bot for Masami Hiramatsu
2009-12-15 15:28 ` [PATCH -tip 12/14] perf probe: Check build-id of vmlinux Masami Hiramatsu
2009-12-15 19:29 ` [tip:perf/urgent] " tip-bot for Masami Hiramatsu
2009-12-15 15:28 ` [PATCH -tip 11/14] perf probe: Reject second attempt of adding same-name event Masami Hiramatsu
2009-12-15 19:29 ` [tip:perf/urgent] " tip-bot for Masami Hiramatsu
2009-12-15 15:28 ` [PATCH -tip 13/14] perf probe: Check symbols in symtab/kallsyms Masami Hiramatsu
2009-12-15 19:28 ` [tip:perf/urgent] " tip-bot for Masami Hiramatsu
2009-12-15 15:28 ` [PATCH -tip 14/14] perf probe: Fix to show which probe point is not found Masami Hiramatsu
2009-12-15 19:28 ` [tip:perf/urgent] " tip-bot for Masami Hiramatsu
2009-12-15 19:23 ` [PATCH -tip 00/14] perf-probe updates 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-3e3405906dab00afecd5a16871850a088eba4626@git.kernel.org \
--to=mhiramat@redhat.com \
--cc=acme@redhat.com \
--cc=ananth@in.ibm.com \
--cc=dle-develop@lists.sourceforge.net \
--cc=fche@redhat.com \
--cc=fweisbec@gmail.com \
--cc=hch@infradead.org \
--cc=hpa@zytor.com \
--cc=jbaron@redhat.com \
--cc=jkenisto@us.ibm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=mingo@redhat.com \
--cc=paulus@samba.org \
--cc=peterz@infradead.org \
--cc=prasad@linux.vnet.ibm.com \
--cc=rostedt@goodmis.org \
--cc=srikar@linux.vnet.ibm.com \
--cc=systemtap@sources.redhat.com \
--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;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).