perf list: Fix --raw-dump option
PATCH 1/1 perf list: Fix --raw-dump option
Currently, 'perf list --raw-dump' requires extra arguments (e.g., hw) to invoke, which breaks bash/zsh completion (perf-completion.sh).
$ perf list --raw-dump
Error: unknown option `raw-dump'usage: perf list [hw|sw|cache|tracepoint|pmu|event_glob]
After,
$ perf list --raw-dump cpu-cycles instructions cache-references cache-misses ...
Signed-off-by Taesoo Kim <[email protected]>
--- tools/perf/builtin-list.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-)
tools/perf/builtin-list.c +10 -3
@@ -19,7 +19,9 @@int cmd_list (int argc,const char **argv,const char *prefix__maybe_unused ) {int i; -const struct option list_options[] = { +bool raw_dump = false; +struct option list_options[] = { +OPT_BOOLEAN (0 ,"raw-dump" , &raw_dump,"Dump raw events" ),OPT_END () };const char *const list_usage[] = {
@@ -27,11 +29,18 @@ int cmd_list(int argc, const char **argv, const char *prefix __maybe_unused) NULL }; +set_option_flag (list_options,0 ,"raw-dump" ,PARSE_OPT_HIDDEN ); + argc =parse_options (argc, argv, list_options, list_usage,PARSE_OPT_STOP_AT_NON_OPTION );setup_pager (); +if (raw_dump) { +print_events (NULL , true); +return 0 ; + } +if (argc ==0 ) {print_events (NULL , false);return 0 ;
@@ -53,8 +62,6 @@ int cmd_list(int argc, const char **argv, const char *prefix __maybe_unused)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 {char *sep =strchr (argv[i],':' ), *s;int sep_idx;
Signature · 1 line
2.2.1
Hi Taesoo,
Quoted 7 lines · Taesoo Kim
Currently, 'perf list --raw-dump' requires extra arguments (e.g., hw) to invoke, which breaks bash/zsh completion (
perf-completion.sh).$ perf list --raw-dump Error: unknown option `raw-dump'
Quoted 8 lines
usage: perf list [hw|sw|cache|tracepoint|pmu|event_glob]
After,
$ perf list --raw-dump cpu-cycles instructions cache-references cache-misses ...Signed-off-by Taesoo Kim <[email protected]>
Acked-by Namhyung Kim <[email protected]>
Thanks,
Namhyung
Quoted 55 lines
--- tools/perf/builtin-list.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-)tools/perf/builtin-list.c +10
-3@@ -19,7 +19,9 @@int cmd_list (int argc,const char **argv,const char *prefix__maybe_unused ) {int i; -const struct option list_options[] = { +bool raw_dump = false; +struct option list_options[] = { +OPT_BOOLEAN (0 ,"raw-dump" , &raw_dump,"Dump raw events" ),OPT_END () };const char *const list_usage[] = {@@ -27,11 +29,18 @@ int cmd_list(int argc, const char **argv, const char *prefix __maybe_unused) NULL }; +set_option_flag (list_options,0 ,"raw-dump" ,PARSE_OPT_HIDDEN ); + argc =parse_options (argc, argv, list_options, list_usage,PARSE_OPT_STOP_AT_NON_OPTION );setup_pager (); +if (raw_dump) { +print_events (NULL , true); +return 0 ; + } +if (argc ==0 ) {print_events (NULL , false);return 0 ;@@ -53,8 +62,6 @@ int cmd_list(int argc, const char **argv, const char *prefix __maybe_unused)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 {char *sep =strchr (argv[i],':' ), *s;int sep_idx;Signature · 7 lines
2.2.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
tip-bot for Taesoo Kim
merge botperf list: Fix --raw-dump option
Commit-ID: b3505208804f3b59150cd77719f01c8b0023a865 Gitweb: http://git.kernel.org/tip/b3505208804f3b59150cd77719f01c8b0023a865 Author: Taesoo Kim <[email protected]> AuthorDate: Tue, 30 Dec 2014 22:36:55 -0500 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Fri, 2 Jan 2015 23:26:58 -0300
perf list: Fix --raw-dump option
Currently, 'perf list --raw-dump' requires extra arguments (e.g., hw) to invoke, which breaks bash/zsh completion (perf-completion.sh).
$ perf list --raw-dump
Error: unknown option `raw-dump'usage: perf list [hw|sw|cache|tracepoint|pmu|event_glob]
After,
$ perf list --raw-dump cpu-cycles instructions cache-references cache-misses ...
Signed-off-by Taesoo Kim <[email protected]>
Acked-by Namhyung Kim <[email protected]>
Cc Ingo Molnar <[email protected]>
Cc Namhyung Kim <[email protected]>
Cc Paul Mackerras <[email protected]>
Cc Peter Zijlstra <[email protected]>
Cc Taesoo kim <[email protected]>
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
--- tools/perf/builtin-list.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-)
tools/perf/builtin-list.c +10 -3
@@ -19,7 +19,9 @@int cmd_list (int argc,const char **argv,const char *prefix__maybe_unused ) {int i; -const struct option list_options[] = { +bool raw_dump = false; +struct option list_options[] = { +OPT_BOOLEAN (0 ,"raw-dump" , &raw_dump,"Dump raw events" ),OPT_END () };const char *const list_usage[] = {
@@ -27,11 +29,18 @@ int cmd_list(int argc, const char **argv, const char *prefix __maybe_unused) NULL }; +set_option_flag (list_options,0 ,"raw-dump" ,PARSE_OPT_HIDDEN ); + argc =parse_options (argc, argv, list_options, list_usage,PARSE_OPT_STOP_AT_NON_OPTION );setup_pager (); +if (raw_dump) { +print_events (NULL , true); +return 0 ; + } +if (argc ==0 ) {print_events (NULL , false);return 0 ;
@@ -53,8 +62,6 @@ int cmd_list(int argc, const char **argv, const char *prefix __maybe_unused)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 {char *sep =strchr (argv[i],':' ), *s;int sep_idx;