perf, tools: Default to cpu// for events v5
PATCH 1/2 perf, tools: Default to cpu// for events v5
From: Andi Kleen <[email protected]>
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/
v2: Handle multiple events
v3: Move to separate function
v4: Move library function to util/string.c
v5: Handle unhandleable errors
--- tools/perf/util/include/linux/string.h | 1 + tools/perf/util/parse-events.c | 30 +++++++++++++++++++++++++++++- tools/perf/util/string.c | 24 ++++++++++++++++++++++++ 3 files changed, 54 insertions(+), 1 deletions(-)
tools/perf/util/include/linux/string.h +1 -0
@@ -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);
tools/perf/util/parse-events.c +29 -1
@@ -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"
@@ -826,6 +826,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;
@@ -846,6 +872,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; }
tools/perf/util/string.c +24 -0
@@ -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 ; +}
Signature · 1 line
1.7.7.6
PATCH 2/2 perf, tools: List kernel supplied event aliases in perf list v3
From: Andi Kleen <[email protected]>
List the kernel supplied pmu event aliases in perf list
It's better when the users can actually see them.
v2: Fix pattern matching
v3: perf_pmu__alias -> perf_pmu_alias
--- tools/perf/Documentation/perf-list.txt | 4 +- tools/perf/builtin-list.c | 3 + tools/perf/util/parse-events.c | 5 ++- tools/perf/util/pmu.c | 73 ++++++++++++++++++++++++++++++++ tools/perf/util/pmu.h | 3 + 5 files changed, 86 insertions(+), 2 deletions(-)
tools/perf/Documentation/perf-list.txt +3 -1
@@ -8,7 +8,7 @@ perf-list - List all symbolic event types SYNOPSIS -------- [verse] -'perf list' [hw|sw|cache|tracepoint|event_glob] +'perf list' [hw|sw|cache|tracepoint|pmu|event_glob] DESCRIPTION -----------
@@ -104,6 +104,8 @@ To limit the list use: 'subsys_glob:event_glob' to filter by tracepoint subsystems such as sched, block, etc. +. 'pmu' to print the kernel supplied PMU events. + . If none of the above is matched, it will apply the supplied glob to all events, printing the ones that match.
tools/perf/builtin-list.c +3 -0
@@ -13,6 +13,7 @@#include "util/parse-events.h" #include "util/cache.h" +#include "util/pmu.h" int cmd_list (int argc,const char **argv,const char *prefix__maybe_unused ) {
@@ -37,6 +38,8 @@ int cmd_list(int argc, const char **argv, const char *prefix __maybe_unused)else if (strcmp (argv[i],"cache" ) ==0 ||strcmp (argv[i],"hwcache" ) ==0 )print_hwcache_events (NULL , false); +else if (strcmp (argv[i],"pmu" ) ==0 ) +print_pmu_events (NULL , false);else if (strcmp (argv[i],"--raw-dump" ) ==0 )print_events (NULL , true);else {
tools/perf/util/parse-events.c +4 -1
@@ -1112,6 +1112,8 @@ int print_hwcache_events(const char *event_glob, bool name_only) } } +if (printed) +printf ("\n" );return printed; }
@@ -1166,11 +1168,12 @@ void print_events(const char *event_glob, bool name_only)print_hwcache_events (event_glob, name_only); +print_pmu_events (event_glob, name_only); +if (event_glob !=NULL )return ;if (!name_only) { -printf ("\n" );printf (" %-50s [%s]\n" ,"rNNN" , event_type_descriptors[PERF_TYPE_RAW ]);
tools/perf/util/pmu.c +73 -0
76 lines not on this page · raw message
tools/perf/util/pmu.h +3 -0
@@ -3,6 +3,7 @@#include <linux/bitops.h> #include <linux/perf_event.h> +#include <stdbool.h> enum {PERF_PMU_FORMAT_VALUE_CONFIG ,
@@ -40,5 +41,7 @@ int perf_pmu__format_parse(char *dir, struct list_head *head);struct perf_pmu *perf_pmu__scan (struct perf_pmu *pmu); +void print_pmu_events (const char *event_glob,bool name_only); +int perf_pmu__test (void );#endif /* __PMU_H */
Signature · 1 line
1.7.7.6
tip-bot for Andi Kleen
merge bot[tip:perf/core] perf list: List kernel supplied event aliases
perf list: List kernel supplied event aliases
Commit-ID: dc098b35b56f83ae088e4291a4e389a6ff126965 Gitweb: http://git.kernel.org/tip/dc098b35b56f83ae088e4291a4e389a6ff126965 Author: Andi Kleen <[email protected]> AuthorDate: Sat, 20 Apr 2013 11:02:29 -0700 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Fri, 12 Jul 2013 13:53:53 -0300
perf list: List kernel supplied event aliases
List the kernel supplied pmu event aliases in perf list
It's better when the users can actually see them.
--- tools/perf/Documentation/perf-list.txt | 4 +- tools/perf/builtin-list.c | 3 ++ tools/perf/util/parse-events.c | 5 ++- tools/perf/util/pmu.c | 73 ++++++++++++++++++++++++++++++++++ tools/perf/util/pmu.h | 3 ++ 5 files changed, 86 insertions(+), 2 deletions(-)
tools/perf/Documentation/perf-list.txt +3 -1
@@ -8,7 +8,7 @@ perf-list - List all symbolic event types SYNOPSIS -------- [verse] -'perf list' [hw|sw|cache|tracepoint|event_glob] +'perf list' [hw|sw|cache|tracepoint|pmu|event_glob] DESCRIPTION -----------
@@ -104,6 +104,8 @@ To limit the list use: 'subsys_glob:event_glob' to filter by tracepoint subsystems such as sched, block, etc. +. 'pmu' to print the kernel supplied PMU events. + . If none of the above is matched, it will apply the supplied glob to all events, printing the ones that match.
tools/perf/builtin-list.c +3 -0
@@ -13,6 +13,7 @@#include "util/parse-events.h" #include "util/cache.h" +#include "util/pmu.h" int cmd_list (int argc,const char **argv,const char *prefix__maybe_unused ) {
@@ -37,6 +38,8 @@ int cmd_list(int argc, const char **argv, const char *prefix __maybe_unused)else if (strcmp (argv[i],"cache" ) ==0 ||strcmp (argv[i],"hwcache" ) ==0 )print_hwcache_events (NULL , false); +else if (strcmp (argv[i],"pmu" ) ==0 ) +print_pmu_events (NULL , false);else if (strcmp (argv[i],"--raw-dump" ) ==0 )print_events (NULL , true);else {
tools/perf/util/parse-events.c +4 -1
@@ -1110,6 +1110,8 @@ int print_hwcache_events(const char *event_glob, bool name_only) } } +if (printed) +printf ("\n" );return printed; }
@@ -1164,11 +1166,12 @@ void print_events(const char *event_glob, bool name_only)print_hwcache_events (event_glob, name_only); +print_pmu_events (event_glob, name_only); +if (event_glob !=NULL )return ;if (!name_only) { -printf ("\n" );printf (" %-50s [%s]\n" ,"rNNN" , event_type_descriptors[PERF_TYPE_RAW ]);
tools/perf/util/pmu.c +73 -0
76 lines not on this page · raw message
tools/perf/util/pmu.h +3 -0
@@ -3,6 +3,7 @@#include <linux/bitops.h> #include <linux/perf_event.h> +#include <stdbool.h> enum {PERF_PMU_FORMAT_VALUE_CONFIG ,
@@ -40,5 +41,7 @@ int perf_pmu__format_parse(char *dir, struct list_head *head);struct perf_pmu *perf_pmu__scan (struct perf_pmu *pmu); +void print_pmu_events (const char *event_glob,bool name_only); +int perf_pmu__test (void );#endif /* __PMU_H */
tip-bot for Andi Kleen
merge bot[tip:perf/core] perf tools: Default to cpu// for events v5
In reply to Andi Kleenperf tools: Default to cpu// for events v5
Commit-ID: 50e200f07948400694238e08e7add73df5ba8f83 Gitweb: http://git.kernel.org/tip/50e200f07948400694238e08e7add73df5ba8f83 Author: Andi Kleen <[email protected]> AuthorDate: Sat, 20 Apr 2013 11:02:28 -0700 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Fri, 12 Jul 2013 13:53:52 -0300
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/
--- tools/perf/util/include/linux/string.h | 1 + tools/perf/util/parse-events.c | 30 +++++++++++++++++++++++++++++- tools/perf/util/string.c | 24 ++++++++++++++++++++++++ 3 files changed, 54 insertions(+), 1 deletion(-)
tools/perf/util/include/linux/string.h +1 -0
@@ -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);
tools/perf/util/parse-events.c +29 -1
@@ -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; }
tools/perf/util/string.c +24 -0
@@ -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 ; +}