perf probe: Add glob matching support on --del

Add glob-expression matching support on --del option.
You can use wildcards for specifying deleting events.
e.g.

 Clear all probe events:

 # perf probe --del '*'

 Clear probes on schedule():

 # perf probe --del 'schedule*'

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: <20091215153210.17436.12327.stgit@dhcp-100-2-132.bos.redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 39 insertions, 13 deletions

diff --git a/tools/perf/util/probe-event.c b/tools/perf/util/probe-event.c
index 3e30be928101..5e99e52b0179 100644
--- a/tools/perf/util/probe-event.c
+++ b/tools/perf/util/probe-event.c
@@ -532,26 +532,50 @@ void add_trace_kprobe_events(struct probe_point *probes, int nr_probes)
         close(fd);
 }
 
+static void __del_trace_kprobe_event(int fd, struct str_node *ent)
+{
+        char *p;
+        char buf[128];
+
+        /* Convert from perf-probe event to trace-kprobe event */
+        if (e_snprintf(buf, 128, "-:%s", ent->s) < 0)
+                die("Failed to copy event.");
+        p = strchr(buf + 2, ':');
+        if (!p)
+                die("Internal error: %s should have ':' but not.", ent->s);
+        *p = '/';
+
+        write_trace_kprobe_event(fd, buf);
+        printf("Remove event: %s\n", ent->s);
+}
+
 static void del_trace_kprobe_event(int fd, const char *group,
                                    const char *event, struct strlist *namelist)
 {
         char buf[128];
-        struct str_node *ent;
+        struct str_node *ent, *n;
+        int found = 0;
 
         if (e_snprintf(buf, 128, "%s:%s", group, event) < 0)
                 die("Failed to copy event.");
-        ent = strlist__find(namelist, buf);
-        if (!ent) {
-                pr_info("Info: event \"%s\" does not exist, could not remove it.\n", buf);
-                return;
-        }
-        /* Convert from perf-probe event to trace-kprobe event */
-        if (e_snprintf(buf, 128, "-:%s/%s", group, event) < 0)
-                die("Failed to copy event.");
 
-        write_trace_kprobe_event(fd, buf);
-        printf("Remove event: %s:%s\n", group, event);
-        strlist__remove(namelist, ent);
+        if (strpbrk(buf, "*?")) { /* Glob-exp */
+                strlist__for_each_safe(ent, n, namelist)
+                        if (strglobmatch(ent->s, buf)) {
+                                found++;
+                                __del_trace_kprobe_event(fd, ent);
+                                strlist__remove(namelist, ent);
+                        }
+        } else {
+                ent = strlist__find(namelist, buf);
+                if (ent) {
+                        found++;
+                        __del_trace_kprobe_event(fd, ent);
+                        strlist__remove(namelist, ent);
+                }
+        }
+        if (found == 0)
+                pr_info("Info: event \"%s\" does not exist, could not remove it.\n", buf);
 }
 
 void del_trace_kprobe_events(struct strlist *dellist)
@@ -570,15 +594,17 @@ void del_trace_kprobe_events(struct strlist *dellist)
                 str = strdup(ent->s);
                 if (!str)
                         die("Failed to copy event.");
+                pr_debug("Parsing: %s\n", str);
                 p = strchr(str, ':');
                 if (p) {
                         group = str;
                         *p = '\0';
                         event = p + 1;
                 } else {
-                        group = PERFPROBE_GROUP;
+                        group = "*";
                         event = str;
                 }
+                pr_debug("Group: %s, Event: %s\n", group, event);
                 del_trace_kprobe_event(fd, group, event, namelist);
                 free(str);
         }