adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-28 11:46:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

perf probe: Fix --del to update current event list

Browse source 
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>
This commit is contained in:
Masami Hiramatsu 2009-12-15 10:31:49 -05:00 committed by Ingo Molnar
parent f6bbff7725
commit 3e3405906d
3 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
tools/perf/util/probe-event.c
View file

@ -540,10 +540,12 @@ static void del_trace_kprobe_event(int fd, const char *group,
const char *event, struct strlist *namelist) const char *event, struct strlist *namelist)
{ {
char buf[128]; char buf[128];
struct str_node *ent;
if (e_snprintf(buf, 128, "%s:%s", group, event) < 0) if (e_snprintf(buf, 128, "%s:%s", group, event) < 0)
die("Failed to copy event."); 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); pr_info("Info: event \"%s\" does not exist, could not remove it.\n", buf);
return; return;
} }
@ -553,6 +555,7 @@ static void del_trace_kprobe_event(int fd, const char *group,
write_trace_kprobe_event(fd, buf); write_trace_kprobe_event(fd, buf);
printf("Remove event: %s:%s\n", group, event); printf("Remove event: %s:%s\n", group, event);
strlist__remove(namelist, ent);
} }
void del_trace_kprobe_events(struct strlist *dellist) void del_trace_kprobe_events(struct strlist *dellist)

6
tools/perf/util/strlist.c
View file

@ -102,7 +102,7 @@ void strlist__remove(struct strlist *self, struct str_node *sn)
str_node__delete(sn, self->dupstr); 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 **p = &self->entries.rb_node;
struct rb_node *parent = NULL; struct rb_node *parent = NULL;
@ -120,10 +120,10 @@ bool strlist__has_entry(struct strlist *self, const char *entry)
else if (rc < 0) else if (rc < 0)
p = &(*p)->rb_right; p = &(*p)->rb_right;
else else
return true; return sn;
} }
return false; return NULL;
} }
static int strlist__parse_list_entry(struct strlist *self, const char *s) static int strlist__parse_list_entry(struct strlist *self, const char *s)

7
tools/perf/util/strlist.h
View file

@ -23,7 +23,12 @@ int strlist__load(struct strlist *self, const char *filename);
int strlist__add(struct strlist *self, const char *str); int strlist__add(struct strlist *self, const char *str);
struct str_node *strlist__entry(const struct strlist *self, unsigned int idx); 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) static inline bool strlist__empty(const struct strlist *self)
{ {