Messages in this thread Patch in this message |  | | From | Andi Kleen <> | Subject | [PATCH 28/29] perf, tools: Default to cpu// for events v5 | Date | Thu, 17 Jan 2013 12:36:51 -0800 |
| |
From: Andi Kleen <ak@linux.intel.com>
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 I can use
perf record -e tx-aborts ...
instead of
perf record -e cpu/tx-aborts/
v2: Handle multiple events v3: Move to separate function v4: Move library function to util/string.c v5: Handle unhandleable errors Signed-off-by: Andi Kleen <ak@linux.intel.com> --- tools/perf/util/include/linux/string.h | 1 + tools/perf/util/parse-events.c | 32 ++++++++++++++++++++++++++++++-- tools/perf/util/string.c | 25 +++++++++++++++++++++++++ 3 files changed, 56 insertions(+), 2 deletions(-)
diff --git a/tools/perf/util/include/linux/string.h b/tools/perf/util/include/linux/string.h index 6f19c54..97a8007 100644 --- 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 5a157b0..3409b15 100644 --- 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" @@ -792,6 +792,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; @@ -812,7 +838,9 @@ 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); - return ret; + 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 346707d..708662d 100644 --- a/tools/perf/util/string.c +++ b/tools/perf/util/string.c @@ -369,3 +369,28 @@ 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. + * Also allow the caller to mishandle unhandleable errors. + */ +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; +} -- 1.7.7.6
|  |