perf tools: Default to cpu// for events v5

When an event fails to parse and it's not in a new style format,
try to parse it again as a cpu event.

This allows to use sysfs exported events directly without //, so you can use

perf record -e mem-loads ...

instead of

perf record -e cpu/mem-loads/

Signed-off-by: Andi Kleen <ak@linux.intel.com>
Link: http://lkml.kernel.org/r/1366480949-32292-1-git-send-email-andi@firstfloor.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/util/include/linux/string.h b/tools/perf/util/include/linux/string.h
index 6f19c548ecc0bc96680a6a529ee844b829578396..97a80073822669accc928265fcf4b052c2e5c9cb 100644 (file)
--- a/tools/perf/util/include/linux/string.h
+++ b/tools/perf/util/include/linux/string.h
@@ -1,3 +1,4 @@
 #include <string.h>
 
 void *memdup(const void *src, size_t len);
+int str_append(char **s, int *len, const char *a);

diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c
index e85376999efc62f03e71859123998785268968b5..a5076f4f6016372361dbc4855dc123082a809292 100644 (file)
--- a/tools/perf/util/parse-events.c
+++ b/tools/perf/util/parse-events.c
@@ -6,7 +6,7 @@
 #include "parse-options.h"
 #include "parse-events.h"
 #include "exec_cmd.h"
-#include "string.h"
+#include "linux/string.h"
 #include "symbol.h"
 #include "cache.h"
 #include "header.h"
@@ -823,6 +823,32 @@ int parse_events_name(struct list_head *list, char *name)
        return 0;
 }
 
+static int parse_events__scanner(const char *str, void *data, int start_token);
+
+static int parse_events_fixup(int ret, const char *str, void *data,
+                             int start_token)
+{
+       char *o = strdup(str);
+       char *s = NULL;
+       char *t = o;
+       char *p;
+       int len = 0;
+
+       if (!o)
+               return ret;
+       while ((p = strsep(&t, ",")) != NULL) {
+               if (s)
+                       str_append(&s, &len, ",");
+               str_append(&s, &len, "cpu/");
+               str_append(&s, &len, p);
+               str_append(&s, &len, "/");
+       }
+       free(o);
+       if (!s)
+               return -ENOMEM;
+       return parse_events__scanner(s, data, start_token);
+}
+
 static int parse_events__scanner(const char *str, void *data, int start_token)
 {
        YY_BUFFER_STATE buffer;
@@ -843,6 +869,8 @@ static int parse_events__scanner(const char *str, void *data, int start_token)
        parse_events__flush_buffer(buffer, scanner);
        parse_events__delete_buffer(buffer, scanner);
        parse_events_lex_destroy(scanner);
+       if (ret && !strchr(str, '/'))
+               ret = parse_events_fixup(ret, str, data, start_token);
        return ret;
 }
 

diff --git a/tools/perf/util/string.c b/tools/perf/util/string.c
index 29c7b2cb252192b8cb9d184ef320c32265de832e..f0b0c008c5075005b562a2a5a2e938dd2644ea51 100644 (file)
--- a/tools/perf/util/string.c
+++ b/tools/perf/util/string.c
@@ -387,3 +387,27 @@ void *memdup(const void *src, size_t len)
 
        return p;
 }
+
+/**
+ * str_append - reallocate string and append another
+ * @s: pointer to string pointer
+ * @len: pointer to len (initialized)
+ * @a: string to append.
+ */
+int str_append(char **s, int *len, const char *a)
+{
+       int olen = *s ? strlen(*s) : 0;
+       int nlen = olen + strlen(a) + 1;
+       if (*len < nlen) {
+               *len = *len * 2;
+               if (*len < nlen)
+                       *len = nlen;
+               *s = realloc(*s, *len);
+               if (!*s)
+                       return -ENOMEM;
+               if (olen == 0)
+                       **s = 0;
+       }
+       strcat(*s, a);
+       return 0;
+}