Messages in this thread Patch in this message | | | Subject | [PATCH perf/core 2/8] [BUGFIX] perf probe: Remove all probes matches given pattern at once | From | Masami Hiramatsu <> | Date | Tue, 21 Apr 2015 20:42:00 +0900 |
| |
Fix perf-probe --del option to delete all matched probes in both of kprobes and uprobes at once.
When we have 2 or more events on different binaries as below,
---- # ./perf probe -l probe:vfs_read (on vfs_read@ksrc/linux-3/fs/read_write.c) probe_libc:malloc (on __libc_malloc@malloc/malloc.c in /usr/lib64/libc-2.17 ----
Trying to remove all event with '*' just removes kprobe events at first. ---- # ./perf probe -d \* Removed event: probe:vfs_read ----
And in 2nd try, it removes all uprobe events. ---- # ./perf probe -d \* Removed event: probe_libc:malloc ----
This fixes to remove all event at once as below. ---- # ./perf probe -d \* Removed event: probe:vfs_read Removed event: probe_libc:malloc ----
Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com> Reported-by: Arnaldo Carvalho de Melo <acme@kernel.org> --- tools/perf/util/probe-event.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-)
diff --git a/tools/perf/util/probe-event.c b/tools/perf/util/probe-event.c index d8bb616..cae1fd7 100644 --- a/tools/perf/util/probe-event.c +++ b/tools/perf/util/probe-event.c @@ -2710,7 +2710,7 @@ static int del_trace_probe_event(int fd, const char *buf, int del_perf_probe_events(struct strlist *dellist) { - int ret = -1, ufd = -1, kfd = -1; + int ret = -1, ret2, ufd = -1, kfd = -1; char buf[128]; const char *group, *event; char *p, *str; @@ -2731,8 +2731,10 @@ int del_perf_probe_events(struct strlist *dellist) goto error; } - if (namelist == NULL && unamelist == NULL) + if (namelist == NULL && unamelist == NULL) { + ret = -ENOENT; goto error; + } strlist__for_each(ent, dellist) { str = strdup(ent->s); @@ -2760,14 +2762,17 @@ int del_perf_probe_events(struct strlist *dellist) pr_debug("Group: %s, Event: %s\n", group, event); + ret = ret2 = -ENOENT; if (namelist) ret = del_trace_probe_event(kfd, buf, namelist); - if (unamelist && ret != 0) - ret = del_trace_probe_event(ufd, buf, unamelist); + if (unamelist) + ret2 = del_trace_probe_event(ufd, buf, unamelist); - if (ret != 0) - pr_info("Info: Event \"%s\" does not exist.\n", buf); + /* Since we can remove probes which already removed, no error */ + if (ret != 0 && ret2 != 0) + pr_debug("Event \"%s\" does not exist.\n", buf); + ret = 0; free(str); }
| |