perf tools: Enhance option parsing error message
Namhyung Kim
maintainercover perf tools: Enhance option parsing error message
Hi,
This patchset tries to enhance error message when perf failed to parse option argument. Currently it just shows entire usage and options which may fill two pages of screen. It's hard for me to say it's really helpful to users. ;-)
With this patch series, it changed to show only related option(s). There're also more points to improve yet - like auto-breaking long lines, dealing with UIs and so on. But I believe this will be a good start.
$ perf report -g help
usage: perf report [<options>]
-g, --call-graph <output_type,min_percent[,print_limit],call_order>
Display callchains using output_type (graph, flat, fractal, or none) , min percent threshold, optional print limit, callchain order, key (function or address). Default: fractal,0.5,callee,function
$ perf stat -Bx, ls -B option not supported with -x
usage: perf stat [<options>] [<command>]
-B, --big-num print large numbers with thousands' separators
-x, --field-separator <separator>
print counts with custom separator
You can get this on 'perf/option-v1' branch in my tree
git://git.kernel.org/pub/scm/linux/kernel/git/namhyung/linux-perf.git
Thanks,
Namhyung
Namhyung Kim (5):
perf tools: Show single option when failed to parse perf report: Postpone setting up browser after parsing options perf report: Use parse_options_usage() for -s option failure perf top: Use parse_options_usage() for -s option failure perf stat: Enhance option parse error message
tools/perf/builtin-report.c | 30 +++--- tools/perf/builtin-stat.c | 42 +++++--- tools/perf/builtin-top.c | 8 +- tools/perf/util/parse-options.c | 218 ++++++++++++++++++++++++---------------- tools/perf/util/parse-options.h | 4 +- 5 files changed, 181 insertions(+), 121 deletions(-)
Signature · 1 line
1.7.11.7
Namhyung Kim
maintainerPATCH 1/5 perf tools: Show single option when failed to parse
From: Namhyung Kim <[email protected]>
Current option parser outputs whole option help string when it failed to parse an option. However this is not good for user if the command has many option, she might feel hard which one is related easily.
Fix it by just showing the help message of the given option only.
--- tools/perf/util/parse-options.c | 217 ++++++++++++++++++++++++---------------- tools/perf/util/parse-options.h | 4 +- 2 files changed, 132 insertions(+), 89 deletions(-)
tools/perf/util/parse-options.c +129 -88
@@ -339,10 +339,10 @@ int parse_options_step(struct parse_opt_ctx_t *ctx,if (arg[1 ] !='-' ) { ctx->opt = arg +1 ;if (internal_help && *ctx->opt =='h' ) -return parse_options_usage (usagestr, options); +return usage_with_options_internal (usagestr, options,0 );switch (parse_short_opt (ctx, options)) {case -1 : -return parse_options_usage (usagestr, options); +return parse_options_usage (usagestr, options, arg +1 ,1 );case -2 : goto unknown;default :
@@ -352,10 +352,11 @@ int parse_options_step(struct parse_opt_ctx_t *ctx,check_typos (arg +1 , options);while (ctx->opt) {if (internal_help && *ctx->opt =='h' ) -return parse_options_usage (usagestr, options); +return usage_with_options_internal (usagestr, options,0 ); + arg = ctx->opt;switch (parse_short_opt (ctx, options)) {case -1 : -return parse_options_usage (usagestr, options); +return parse_options_usage (usagestr, options, arg,1 );case -2 :/* fake a short option thing to hide the fact that we may have * started to parse aggregated stuff
@@ -383,12 +384,12 @@ int parse_options_step(struct parse_opt_ctx_t *ctx,if (internal_help && !strcmp (arg +2 ,"help-all" ))return usage_with_options_internal (usagestr, options,1 );if (internal_help && !strcmp (arg +2 ,"help" )) -return parse_options_usage (usagestr, options); +return usage_with_options_internal (usagestr, options,0 );if (!strcmp (arg +2 ,"list-opts" ))return PARSE_OPT_LIST ;switch (parse_long_opt (ctx, arg +2 , options)) {case -1 : -return parse_options_usage (usagestr, options); +return parse_options_usage (usagestr, options, arg +2 ,0 );case -2 : goto unknown;default :
@@ -445,6 +446,89 @@ int parse_options(int argc, const char **argv, const struct option *options,#define USAGE_OPTS_WIDTH 24#define USAGE_GAP 2 +static void print_option_help (const struct option *opts,int full) +{ +size_t pos; +int pad; + +if (opts->type ==OPTION_GROUP ) { +fputc ('\n' , stderr); +if (*opts->help) +fprintf (stderr,"%s\n" , opts->help); +return ; + } +if (!full && (opts->flags &PARSE_OPT_HIDDEN )) +return ; + + pos =fprintf (stderr," " ); +if (opts->short_name) + pos +=fprintf (stderr,"-%c" , opts->short_name); +else + pos +=fprintf (stderr," " ); + +if (opts->long_name && opts->short_name) + pos +=fprintf (stderr,", " ); +if (opts->long_name) + pos +=fprintf (stderr,"--%s" , opts->long_name); + +switch (opts->type) { +case OPTION_ARGUMENT : +break ; +case OPTION_LONG : +case OPTION_U64 : +case OPTION_INTEGER : +case OPTION_UINTEGER : +if (opts->flags &PARSE_OPT_OPTARG ) +if (opts->long_name) + pos +=fprintf (stderr,"[=<n>]" ); +else + pos +=fprintf (stderr,"[<n>]" ); +else + pos +=fprintf (stderr," <n>" ); +break ; +case OPTION_CALLBACK : +if (opts->flags &PARSE_OPT_NOARG ) +break ; +/* FALLTHROUGH */ +case OPTION_STRING : +if (opts->argh) { +if (opts->flags &PARSE_OPT_OPTARG ) +if (opts->long_name) + pos +=fprintf (stderr,"[=<%s>]" , opts->argh); +else + pos +=fprintf (stderr,"[<%s>]" , opts->argh); +else + pos +=fprintf (stderr," <%s>" , opts->argh); + }else { +if (opts->flags &PARSE_OPT_OPTARG ) +if (opts->long_name) + pos +=fprintf (stderr,"[=...]" ); +else + pos +=fprintf (stderr,"[...]" ); +else + pos +=fprintf (stderr," ..." ); + } +break ; +default :/* OPTION_{BIT,BOOLEAN,SET_UINT,SET_PTR} */ +case OPTION_END : +case OPTION_GROUP : +case OPTION_BIT : +case OPTION_BOOLEAN : +case OPTION_INCR : +case OPTION_SET_UINT : +case OPTION_SET_PTR : +break ; + } + +if (pos <=USAGE_OPTS_WIDTH ) + pad =USAGE_OPTS_WIDTH - pos; +else { +fputc ('\n' , stderr); + pad =USAGE_OPTS_WIDTH ; + } +fprintf (stderr,"%*s%s\n" , pad +USAGE_GAP ,"" , opts->help); +} +int usage_with_options_internal (const char *const *usagestr,const struct option *opts,int full) {
@@ -464,87 +548,9 @@ int usage_with_options_internal(const char * const *usagestr,if (opts->type !=OPTION_GROUP )fputc ('\n' , stderr); -for (; opts->type !=OPTION_END ; opts++) { -size_t pos; -int pad; - -if (opts->type ==OPTION_GROUP ) { -fputc ('\n' , stderr); -if (*opts->help) -fprintf (stderr,"%s\n" , opts->help); -continue ; - } -if (!full && (opts->flags &PARSE_OPT_HIDDEN )) -continue ; - - pos =fprintf (stderr," " ); -if (opts->short_name) - pos +=fprintf (stderr,"-%c" , opts->short_name); -else - pos +=fprintf (stderr," " ); - -if (opts->long_name && opts->short_name) - pos +=fprintf (stderr,", " ); -if (opts->long_name) - pos +=fprintf (stderr,"--%s" , opts->long_name); +for ( ; opts->type !=OPTION_END ; opts++) +print_option_help (opts, full); -switch (opts->type) { -case OPTION_ARGUMENT : -break ; -case OPTION_LONG : -case OPTION_U64 : -case OPTION_INTEGER : -case OPTION_UINTEGER : -if (opts->flags &PARSE_OPT_OPTARG ) -if (opts->long_name) - pos +=fprintf (stderr,"[=<n>]" ); -else - pos +=fprintf (stderr,"[<n>]" ); -else - pos +=fprintf (stderr," <n>" ); -break ; -case OPTION_CALLBACK : -if (opts->flags &PARSE_OPT_NOARG ) -break ; -/* FALLTHROUGH */ -case OPTION_STRING : -if (opts->argh) { -if (opts->flags &PARSE_OPT_OPTARG ) -if (opts->long_name) - pos +=fprintf (stderr,"[=<%s>]" , opts->argh); -else - pos +=fprintf (stderr,"[<%s>]" , opts->argh); -else - pos +=fprintf (stderr," <%s>" , opts->argh); - }else { -if (opts->flags &PARSE_OPT_OPTARG ) -if (opts->long_name) - pos +=fprintf (stderr,"[=...]" ); -else - pos +=fprintf (stderr,"[...]" ); -else - pos +=fprintf (stderr," ..." ); - } -break ; -default :/* OPTION_{BIT,BOOLEAN,SET_UINT,SET_PTR} */ -case OPTION_END : -case OPTION_GROUP : -case OPTION_BIT : -case OPTION_BOOLEAN : -case OPTION_INCR : -case OPTION_SET_UINT : -case OPTION_SET_PTR : -break ; - } - -if (pos <=USAGE_OPTS_WIDTH ) - pad =USAGE_OPTS_WIDTH - pos; -else { -fputc ('\n' , stderr); - pad =USAGE_OPTS_WIDTH ; - } -fprintf (stderr,"%*s%s\n" , pad +USAGE_GAP ,"" , opts->help); - }fputc ('\n' , stderr);return PARSE_OPT_HELP ;
@@ -559,9 +565,44 @@ void usage_with_options(const char * const *usagestr, }int parse_options_usage (const char *const *usagestr, -const struct option *opts) +const struct option *opts, +const char *optstr,bool short_opt) { -return usage_with_options_internal (usagestr, opts,0 ); +if (!usagestr) +return PARSE_OPT_HELP ; + +fprintf (stderr,"\n usage: %s\n" , *usagestr++); +while (*usagestr && **usagestr) +fprintf (stderr," or: %s\n" , *usagestr++); +while (*usagestr) { +fprintf (stderr,"%s%s\n" , + **usagestr ?" " :"" , + *usagestr); + usagestr++; + } +fputc ('\n' , stderr); + +for ( ; opts->type !=OPTION_END ; opts++) { +if (short_opt) { +if (opts->short_name == *optstr) +break ; +continue ; + } + +if (opts->long_name ==NULL ) +continue ; + +if (!prefixcmp (optstr, opts->long_name)) +break ; +if (!prefixcmp (optstr,"no-" ) && + !prefixcmp (optstr +3 , opts->long_name)) +break ; + } + +if (opts->type !=OPTION_END ) +print_option_help (opts,0 ); + +return PARSE_OPT_HELP ; }
tools/perf/util/parse-options.h +3 -1
@@ -158,7 +158,9 @@ struct parse_opt_ctx_t { };extern int parse_options_usage (const char *const *usagestr, -const struct option *opts); +const struct option *opts, +const char *optstr, +bool short_opt);extern void parse_options_start (struct parse_opt_ctx_t *ctx,int argc,const char **argv,int flags);
Signature · 1 line
1.7.11.7
tip-bot for Namhyung Kim
merge bot[tip:perf/core] perf tools: Show single option when failed to parse
perf tools: Show single option when failed to parse
Commit-ID: ac6976255076d4bf761abfbecb19d46af5b88046 Gitweb: http://git.kernel.org/tip/ac6976255076d4bf761abfbecb19d46af5b88046 Author: Namhyung Kim <[email protected]> AuthorDate: Fri, 1 Nov 2013 16:33:11 +0900 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Mon, 4 Nov 2013 12:51:45 -0300
perf tools: Show single option when failed to parse
Current option parser outputs whole option help string when it failed to parse an option. However this is not good for user if the command has many option, she might feel hard which one is related easily.
Fix it by just showing the help message of the given option only.
--- tools/perf/util/parse-options.c | 217 ++++++++++++++++++++++++---------------- tools/perf/util/parse-options.h | 4 +- 2 files changed, 132 insertions(+), 89 deletions(-)
tools/perf/util/parse-options.c +129 -88
@@ -339,10 +339,10 @@ int parse_options_step(struct parse_opt_ctx_t *ctx,if (arg[1 ] !='-' ) { ctx->opt = arg +1 ;if (internal_help && *ctx->opt =='h' ) -return parse_options_usage (usagestr, options); +return usage_with_options_internal (usagestr, options,0 );switch (parse_short_opt (ctx, options)) {case -1 : -return parse_options_usage (usagestr, options); +return parse_options_usage (usagestr, options, arg +1 ,1 );case -2 : goto unknown;default :
@@ -352,10 +352,11 @@ int parse_options_step(struct parse_opt_ctx_t *ctx,check_typos (arg +1 , options);while (ctx->opt) {if (internal_help && *ctx->opt =='h' ) -return parse_options_usage (usagestr, options); +return usage_with_options_internal (usagestr, options,0 ); + arg = ctx->opt;switch (parse_short_opt (ctx, options)) {case -1 : -return parse_options_usage (usagestr, options); +return parse_options_usage (usagestr, options, arg,1 );case -2 :/* fake a short option thing to hide the fact that we may have * started to parse aggregated stuff
@@ -383,12 +384,12 @@ int parse_options_step(struct parse_opt_ctx_t *ctx,if (internal_help && !strcmp (arg +2 ,"help-all" ))return usage_with_options_internal (usagestr, options,1 );if (internal_help && !strcmp (arg +2 ,"help" )) -return parse_options_usage (usagestr, options); +return usage_with_options_internal (usagestr, options,0 );if (!strcmp (arg +2 ,"list-opts" ))return PARSE_OPT_LIST ;switch (parse_long_opt (ctx, arg +2 , options)) {case -1 : -return parse_options_usage (usagestr, options); +return parse_options_usage (usagestr, options, arg +2 ,0 );case -2 : goto unknown;default :
@@ -445,6 +446,89 @@ int parse_options(int argc, const char **argv, const struct option *options,#define USAGE_OPTS_WIDTH 24#define USAGE_GAP 2 +static void print_option_help (const struct option *opts,int full) +{ +size_t pos; +int pad; + +if (opts->type ==OPTION_GROUP ) { +fputc ('\n' , stderr); +if (*opts->help) +fprintf (stderr,"%s\n" , opts->help); +return ; + } +if (!full && (opts->flags &PARSE_OPT_HIDDEN )) +return ; + + pos =fprintf (stderr," " ); +if (opts->short_name) + pos +=fprintf (stderr,"-%c" , opts->short_name); +else + pos +=fprintf (stderr," " ); + +if (opts->long_name && opts->short_name) + pos +=fprintf (stderr,", " ); +if (opts->long_name) + pos +=fprintf (stderr,"--%s" , opts->long_name); + +switch (opts->type) { +case OPTION_ARGUMENT : +break ; +case OPTION_LONG : +case OPTION_U64 : +case OPTION_INTEGER : +case OPTION_UINTEGER : +if (opts->flags &PARSE_OPT_OPTARG ) +if (opts->long_name) + pos +=fprintf (stderr,"[=<n>]" ); +else + pos +=fprintf (stderr,"[<n>]" ); +else + pos +=fprintf (stderr," <n>" ); +break ; +case OPTION_CALLBACK : +if (opts->flags &PARSE_OPT_NOARG ) +break ; +/* FALLTHROUGH */ +case OPTION_STRING : +if (opts->argh) { +if (opts->flags &PARSE_OPT_OPTARG ) +if (opts->long_name) + pos +=fprintf (stderr,"[=<%s>]" , opts->argh); +else + pos +=fprintf (stderr,"[<%s>]" , opts->argh); +else + pos +=fprintf (stderr," <%s>" , opts->argh); + }else { +if (opts->flags &PARSE_OPT_OPTARG ) +if (opts->long_name) + pos +=fprintf (stderr,"[=...]" ); +else + pos +=fprintf (stderr,"[...]" ); +else + pos +=fprintf (stderr," ..." ); + } +break ; +default :/* OPTION_{BIT,BOOLEAN,SET_UINT,SET_PTR} */ +case OPTION_END : +case OPTION_GROUP : +case OPTION_BIT : +case OPTION_BOOLEAN : +case OPTION_INCR : +case OPTION_SET_UINT : +case OPTION_SET_PTR : +break ; + } + +if (pos <=USAGE_OPTS_WIDTH ) + pad =USAGE_OPTS_WIDTH - pos; +else { +fputc ('\n' , stderr); + pad =USAGE_OPTS_WIDTH ; + } +fprintf (stderr,"%*s%s\n" , pad +USAGE_GAP ,"" , opts->help); +} +int usage_with_options_internal (const char *const *usagestr,const struct option *opts,int full) {
@@ -464,87 +548,9 @@ int usage_with_options_internal(const char * const *usagestr,if (opts->type !=OPTION_GROUP )fputc ('\n' , stderr); -for (; opts->type !=OPTION_END ; opts++) { -size_t pos; -int pad; - -if (opts->type ==OPTION_GROUP ) { -fputc ('\n' , stderr); -if (*opts->help) -fprintf (stderr,"%s\n" , opts->help); -continue ; - } -if (!full && (opts->flags &PARSE_OPT_HIDDEN )) -continue ; - - pos =fprintf (stderr," " ); -if (opts->short_name) - pos +=fprintf (stderr,"-%c" , opts->short_name); -else - pos +=fprintf (stderr," " ); - -if (opts->long_name && opts->short_name) - pos +=fprintf (stderr,", " ); -if (opts->long_name) - pos +=fprintf (stderr,"--%s" , opts->long_name); +for ( ; opts->type !=OPTION_END ; opts++) +print_option_help (opts, full); -switch (opts->type) { -case OPTION_ARGUMENT : -break ; -case OPTION_LONG : -case OPTION_U64 : -case OPTION_INTEGER : -case OPTION_UINTEGER : -if (opts->flags &PARSE_OPT_OPTARG ) -if (opts->long_name) - pos +=fprintf (stderr,"[=<n>]" ); -else - pos +=fprintf (stderr,"[<n>]" ); -else - pos +=fprintf (stderr," <n>" ); -break ; -case OPTION_CALLBACK : -if (opts->flags &PARSE_OPT_NOARG ) -break ; -/* FALLTHROUGH */ -case OPTION_STRING : -if (opts->argh) { -if (opts->flags &PARSE_OPT_OPTARG ) -if (opts->long_name) - pos +=fprintf (stderr,"[=<%s>]" , opts->argh); -else - pos +=fprintf (stderr,"[<%s>]" , opts->argh); -else - pos +=fprintf (stderr," <%s>" , opts->argh); - }else { -if (opts->flags &PARSE_OPT_OPTARG ) -if (opts->long_name) - pos +=fprintf (stderr,"[=...]" ); -else - pos +=fprintf (stderr,"[...]" ); -else - pos +=fprintf (stderr," ..." ); - } -break ; -default :/* OPTION_{BIT,BOOLEAN,SET_UINT,SET_PTR} */ -case OPTION_END : -case OPTION_GROUP : -case OPTION_BIT : -case OPTION_BOOLEAN : -case OPTION_INCR : -case OPTION_SET_UINT : -case OPTION_SET_PTR : -break ; - } - -if (pos <=USAGE_OPTS_WIDTH ) - pad =USAGE_OPTS_WIDTH - pos; -else { -fputc ('\n' , stderr); - pad =USAGE_OPTS_WIDTH ; - } -fprintf (stderr,"%*s%s\n" , pad +USAGE_GAP ,"" , opts->help); - }fputc ('\n' , stderr);return PARSE_OPT_HELP ;
@@ -559,9 +565,44 @@ void usage_with_options(const char * const *usagestr, }int parse_options_usage (const char *const *usagestr, -const struct option *opts) +const struct option *opts, +const char *optstr,bool short_opt) { -return usage_with_options_internal (usagestr, opts,0 ); +if (!usagestr) +return PARSE_OPT_HELP ; + +fprintf (stderr,"\n usage: %s\n" , *usagestr++); +while (*usagestr && **usagestr) +fprintf (stderr," or: %s\n" , *usagestr++); +while (*usagestr) { +fprintf (stderr,"%s%s\n" , + **usagestr ?" " :"" , + *usagestr); + usagestr++; + } +fputc ('\n' , stderr); + +for ( ; opts->type !=OPTION_END ; opts++) { +if (short_opt) { +if (opts->short_name == *optstr) +break ; +continue ; + } + +if (opts->long_name ==NULL ) +continue ; + +if (!prefixcmp (optstr, opts->long_name)) +break ; +if (!prefixcmp (optstr,"no-" ) && + !prefixcmp (optstr +3 , opts->long_name)) +break ; + } + +if (opts->type !=OPTION_END ) +print_option_help (opts,0 ); + +return PARSE_OPT_HELP ; }
tools/perf/util/parse-options.h +3 -1
@@ -158,7 +158,9 @@ struct parse_opt_ctx_t { };extern int parse_options_usage (const char *const *usagestr, -const struct option *opts); +const struct option *opts, +const char *optstr, +bool short_opt);extern void parse_options_start (struct parse_opt_ctx_t *ctx,int argc,const char **argv,int flags);
Namhyung Kim
maintainerPATCH 2/5 perf report: Postpone setting up browser after parsing options
In reply to Namhyung KimFrom: Namhyung Kim <[email protected]>
If setup_browser() called earlier than option parsing, the actual error message can be discarded during the terminal reset. So move it after setup_sorting() checks whether the sort keys are valid.
--- tools/perf/builtin-report.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-)
tools/perf/builtin-report.c +12 -12
@@ -905,13 +905,6 @@ int cmd_report(int argc, const char **argv, const char *prefix __maybe_unused) input_name ="perf.data" ; } -if (strcmp (input_name,"-" ) !=0 ) -setup_browser (true); -else { - use_browser =0 ; -perf_hpp__init (); - } - file.path = input_name; file.force = report.force;
@@ -957,6 +950,18 @@ repeat:if (setup_sorting () <0 )usage_with_options (report_usage, options); +if (parent_pattern != default_parent_pattern) { +if (sort_dimension__add ("parent" ) <0 ) + goto error; + } + +if (strcmp (input_name,"-" ) !=0 ) +setup_browser (true); +else { + use_browser =0 ; +perf_hpp__init (); + } +/* * Only in the TUI browser we are doing integrated annotation, * so don't allocate extra space that won't be used in the stdio
@@ -986,11 +991,6 @@ repeat:if (symbol__init () <0 ) goto error; -if (parent_pattern != default_parent_pattern) { -if (sort_dimension__add ("parent" ) <0 ) - goto error; - } -if (argc) {/* * Special case: if there's an argument left then assume that
Signature · 1 line
1.7.11.7
tip-bot for Namhyung Kim
merge bot[tip:perf/core] perf report: Postpone setting up browser after parsing options
perf report: Postpone setting up browser after parsing options
Commit-ID: 4bceffbc26fab2444742db59c6f8124c29e41369 Gitweb: http://git.kernel.org/tip/4bceffbc26fab2444742db59c6f8124c29e41369 Author: Namhyung Kim <[email protected]> AuthorDate: Fri, 1 Nov 2013 16:33:12 +0900 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Mon, 4 Nov 2013 12:54:32 -0300
perf report: Postpone setting up browser after parsing options
If setup_browser() called earlier than option parsing, the actual error message can be discarded during the terminal reset. So move it after setup_sorting() checks whether the sort keys are valid.
--- tools/perf/builtin-report.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-)
tools/perf/builtin-report.c +12 -12
@@ -905,13 +905,6 @@ int cmd_report(int argc, const char **argv, const char *prefix __maybe_unused) input_name ="perf.data" ; } -if (strcmp (input_name,"-" ) !=0 ) -setup_browser (true); -else { - use_browser =0 ; -perf_hpp__init (); - } - file.path = input_name; file.force = report.force;
@@ -957,6 +950,18 @@ repeat:if (setup_sorting () <0 )usage_with_options (report_usage, options); +if (parent_pattern != default_parent_pattern) { +if (sort_dimension__add ("parent" ) <0 ) + goto error; + } + +if (strcmp (input_name,"-" ) !=0 ) +setup_browser (true); +else { + use_browser =0 ; +perf_hpp__init (); + } +/* * Only in the TUI browser we are doing integrated annotation, * so don't allocate extra space that won't be used in the stdio
@@ -986,11 +991,6 @@ repeat:if (symbol__init () <0 ) goto error; -if (parent_pattern != default_parent_pattern) { -if (sort_dimension__add ("parent" ) <0 ) - goto error; - } -if (argc) {/* * Special case: if there's an argument left then assume that
Namhyung Kim
maintainerPATCH 3/5 perf report: Use parse_options_usage() for -s option failure
In reply to Namhyung KimFrom: Namhyung Kim <[email protected]>
The -s (--sort) option was processed after normal option parsing so that it cannot call the parse_options_usage() automatically. Currently it calls usage_with_options() which shows entire help messages for event option. Fix it by showing just -s options.
$ perf report -s help
Error: Unknown --sort key: `help'usage: perf report [<options>]
-s, --sort <key[,key2...]>
sort by key(s): pid, comm, dso, symbol, ...
--- tools/perf/builtin-report.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
tools/perf/builtin-report.c +4 -2
@@ -947,8 +947,10 @@ repeat: sort_order ="local_weight,mem,sym,dso,symbol_daddr,dso_daddr,snoop,tlb,locked" ; } -if (setup_sorting () <0 ) -usage_with_options (report_usage, options); +if (setup_sorting () <0 ) { +parse_options_usage (report_usage, options,"s" ,1 ); + goto error; + }if (parent_pattern != default_parent_pattern) {if (sort_dimension__add ("parent" ) <0 )
Signature · 1 line
1.7.11.7
tip-bot for Namhyung Kim
merge bot[tip:perf/core] perf report: Use parse_options_usage() for -s option failure
perf report: Use parse_options_usage() for -s option failure
Commit-ID: 91aba0a62e24ff7a567e13e1d88deab711df6f0f Gitweb: http://git.kernel.org/tip/91aba0a62e24ff7a567e13e1d88deab711df6f0f Author: Namhyung Kim <[email protected]> AuthorDate: Fri, 1 Nov 2013 16:33:13 +0900 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Mon, 4 Nov 2013 12:55:17 -0300
perf report: Use parse_options_usage() for -s option failure
The -s (--sort) option was processed after normal option parsing so that it cannot call the parse_options_usage() automatically. Currently it calls usage_with_options() which shows entire help messages for event option. Fix it by showing just -s options.
$ perf report -s help
Error: Unknown --sort key: `help'usage: perf report [<options>]
-s, --sort <key[,key2...]>
sort by key(s): pid, comm, dso, symbol, ...
--- tools/perf/builtin-report.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
tools/perf/builtin-report.c +4 -2
@@ -947,8 +947,10 @@ repeat: sort_order ="local_weight,mem,sym,dso,symbol_daddr,dso_daddr,snoop,tlb,locked" ; } -if (setup_sorting () <0 ) -usage_with_options (report_usage, options); +if (setup_sorting () <0 ) { +parse_options_usage (report_usage, options,"s" ,1 ); + goto error; + }if (parent_pattern != default_parent_pattern) {if (sort_dimension__add ("parent" ) <0 )
Namhyung Kim
maintainerPATCH 4/5 perf top: Use parse_options_usage() for -s option failure
In reply to Namhyung KimFrom: Namhyung Kim <[email protected]>
The -s (--sort) option was processed after normal option parsing so that it cannot call the parse_options_usage() automatically. Currently it calls usage_with_options() which shows entire help messages for event option. Fix it by showing just -s options.
$ perf top -s help
Error: Unknown --sort key: `help'usage: perf top [<options>]
-s, --sort <key[,key2...]>
sort by key(s): pid, comm, dso, symbol, ...
--- tools/perf/builtin-top.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
tools/perf/builtin-top.c +5 -3
@@ -1040,7 +1040,7 @@ parse_percent_limit(const struct option *opt, const char *arg,int cmd_top (int argc,const char **argv,const char *prefix__maybe_unused ) { -int status; +int status =-1 ;char errbuf[BUFSIZ ];struct perf_top top = { .count_filter =5 ,
@@ -1156,8 +1156,10 @@ int cmd_top(int argc, const char **argv, const char *prefix __maybe_unused)if (sort_order == default_sort_order) sort_order ="dso,symbol" ; -if (setup_sorting () <0 ) -usage_with_options (top_usage, options); +if (setup_sorting () <0 ) { +parse_options_usage (top_usage, options,"s" ,1 ); + goto out_delete_evlist; + }/* display thread wants entries to be collapsed in a different tree */ sort__need_collapse =1 ;
Signature · 1 line
1.7.11.7
tip-bot for Namhyung Kim
merge bot[tip:perf/core] perf top: Use parse_options_usage() for -s option failure
perf top: Use parse_options_usage() for -s option failure
Commit-ID: d37a92dcb45094dc02836c8a77c693c6f9916fb2 Gitweb: http://git.kernel.org/tip/d37a92dcb45094dc02836c8a77c693c6f9916fb2 Author: Namhyung Kim <[email protected]> AuthorDate: Fri, 1 Nov 2013 16:33:14 +0900 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Mon, 4 Nov 2013 12:56:41 -0300
perf top: Use parse_options_usage() for -s option failure
The -s (--sort) option was processed after normal option parsing so that it cannot call the parse_options_usage() automatically. Currently it calls usage_with_options() which shows entire help messages for event option. Fix it by showing just -s options.
$ perf top -s help
Error: Unknown --sort key: `help'usage: perf top [<options>]
-s, --sort <key[,key2...]>
sort by key(s): pid, comm, dso, symbol, ...
--- tools/perf/builtin-top.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
tools/perf/builtin-top.c +5 -3
@@ -1040,7 +1040,7 @@ parse_percent_limit(const struct option *opt, const char *arg,int cmd_top (int argc,const char **argv,const char *prefix__maybe_unused ) { -int status; +int status =-1 ;char errbuf[BUFSIZ ];struct perf_top top = { .count_filter =5 ,
@@ -1159,8 +1159,10 @@ int cmd_top(int argc, const char **argv, const char *prefix __maybe_unused)if (sort_order == default_sort_order) sort_order ="dso,symbol" ; -if (setup_sorting () <0 ) -usage_with_options (top_usage, options); +if (setup_sorting () <0 ) { +parse_options_usage (top_usage, options,"s" ,1 ); + goto out_delete_evlist; + }/* display thread wants entries to be collapsed in a different tree */ sort__need_collapse =1 ;
Namhyung Kim
maintainerPATCH 5/5 perf stat: Enhance option parse error message
In reply to Namhyung KimFrom: Namhyung Kim <[email protected]>
Print related option help messages only when it failed to process options. While at it, modify parse_options_usage() to skip usage part so that it can be used for showing multiple option help messages naturally like below:
$ perf stat -Bx, ls -B option not supported with -x
usage: perf stat [<options>] [<command>]
-B, --big-num print large numbers with thousands' separators
-x, --field-separator <separator>
print counts with custom separator
--- tools/perf/builtin-stat.c | 42 ++++++++++++++++++++++++++--------------- tools/perf/util/parse-options.c | 3 ++- 2 files changed, 29 insertions(+), 16 deletions(-)
tools/perf/builtin-stat.c +27 -15
@@ -1596,7 +1596,7 @@ int cmd_stat(int argc, const char **argv, const char *prefix __maybe_unused)"perf stat [<options>] [<command>]" , NULL }; -int status = -ENOMEM , run_idx; +int status = -EINVAL , run_idx;const char *mode;setlocale (LC_ALL ,"" );
@@ -1614,12 +1614,15 @@ int cmd_stat(int argc, const char **argv, const char *prefix __maybe_unused)if (output_name && output_fd) {fprintf (stderr,"cannot use both --output and --log-fd\n" ); -usage_with_options (stat_usage, options); +parse_options_usage (stat_usage, options,"o" ,1 ); +parse_options_usage (NULL , options,"log-fd" ,0 ); + goto out; }if (output_fd <0 ) {fprintf (stderr,"argument to --log-fd must be a > 0\n" ); -usage_with_options (stat_usage, options); +parse_options_usage (stat_usage, options,"log-fd" ,0 ); + goto out; }if (!output) {
@@ -1656,7 +1659,9 @@ int cmd_stat(int argc, const char **argv, const char *prefix __maybe_unused)/* User explicitly passed -B? */ if (big_num_opt ==1 ) {fprintf (stderr,"-B option not supported with -x\n" ); -usage_with_options (stat_usage, options); +parse_options_usage (stat_usage, options,"B" ,1 ); +parse_options_usage (NULL , options,"x" ,1 ); + goto out; }else /* Nope, so disable big number formatting */ big_num = false; }else if (big_num_opt ==0 )/* User passed --no-big-num */
@@ -1666,7 +1671,9 @@ int cmd_stat(int argc, const char **argv, const char *prefix __maybe_unused)usage_with_options (stat_usage, options);if (run_count <0 ) { -usage_with_options (stat_usage, options); +pr_err ("Run count must be a positive number\n" ); +parse_options_usage (stat_usage, options,"r" ,1 ); + goto out; }else if (run_count ==0 ) { forever = true; run_count =1 ;
@@ -1678,8 +1685,10 @@ int cmd_stat(int argc, const char **argv, const char *prefix __maybe_unused)fprintf (stderr,"both cgroup and no-aggregation " "modes only available in system-wide mode\n" ); -usage_with_options (stat_usage, options); -return -1 ; +parse_options_usage (stat_usage, options,"G" ,1 ); +parse_options_usage (NULL , options,"A" ,1 ); +parse_options_usage (NULL , options,"a" ,1 ); + goto out; }if (add_default_attributes ())
@@ -1688,25 +1697,28 @@ int cmd_stat(int argc, const char **argv, const char *prefix __maybe_unused)perf_target__validate (&target);if (perf_evlist__create_maps (evsel_list, &target) <0 ) { -if (perf_target__has_task (&target)) +if (perf_target__has_task (&target)) {pr_err ("Problems finding threads of monitor\n" ); -if (perf_target__has_cpu (&target)) +parse_options_usage (stat_usage, options,"p" ,1 ); +parse_options_usage (NULL , options,"t" ,1 ); + }else if (perf_target__has_cpu (&target)) {perror ("failed to parse CPUs map" ); - -usage_with_options (stat_usage, options); -return -1 ; +parse_options_usage (stat_usage, options,"C" ,1 ); +parse_options_usage (NULL , options,"a" ,1 ); + } + goto out; }if (interval && interval <100 ) {pr_err ("print interval must be >= 100ms\n" ); -usage_with_options (stat_usage, options); -return -1 ; +parse_options_usage (stat_usage, options,"I" ,1 ); + goto out_free_maps; }if (perf_evlist__alloc_stats (evsel_list, interval)) goto out_free_maps;if (perf_stat_init_aggr_mode ()) - goto out; + goto out_free_maps;/* * We dont want to block the signals - that would cause
tools/perf/util/parse-options.c +2 -1
@@ -569,7 +569,7 @@ int parse_options_usage(const char * const *usagestr, const char *optstr, bool short_opt) { if (!usagestr) - return PARSE_OPT_HELP; + goto opt;fprintf (stderr,"\n usage: %s\n" , *usagestr++);while (*usagestr && **usagestr)
@@ -582,6 +582,7 @@ int parse_options_usage(const char * const *usagestr, }fputc ('\n' , stderr); +opt:for ( ; opts->type !=OPTION_END ; opts++) {if (short_opt) {if (opts->short_name == *optstr)
Signature · 1 line
1.7.11.7
tip-bot for Namhyung Kim
merge bot[tip:perf/core] perf stat: Enhance option parse error message
perf stat: Enhance option parse error message
Commit-ID: cc03c54296ccbeca5363dfe8f49af42d14960f28 Gitweb: http://git.kernel.org/tip/cc03c54296ccbeca5363dfe8f49af42d14960f28 Author: Namhyung Kim <[email protected]> AuthorDate: Fri, 1 Nov 2013 16:33:15 +0900 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Mon, 4 Nov 2013 12:57:36 -0300
perf stat: Enhance option parse error message
Print related option help messages only when it failed to process options. While at it, modify parse_options_usage() to skip usage part so that it can be used for showing multiple option help messages naturally like below:
$ perf stat -Bx, ls -B option not supported with -x
usage: perf stat [<options>] [<command>]
-B, --big-num print large numbers with thousands' separators
-x, --field-separator <separator>
print counts with custom separator
--- tools/perf/builtin-stat.c | 42 ++++++++++++++++++++++++++--------------- tools/perf/util/parse-options.c | 3 ++- 2 files changed, 29 insertions(+), 16 deletions(-)
tools/perf/builtin-stat.c +27 -15
@@ -1596,7 +1596,7 @@ int cmd_stat(int argc, const char **argv, const char *prefix __maybe_unused)"perf stat [<options>] [<command>]" , NULL }; -int status = -ENOMEM , run_idx; +int status = -EINVAL , run_idx;const char *mode;setlocale (LC_ALL ,"" );
@@ -1614,12 +1614,15 @@ int cmd_stat(int argc, const char **argv, const char *prefix __maybe_unused)if (output_name && output_fd) {fprintf (stderr,"cannot use both --output and --log-fd\n" ); -usage_with_options (stat_usage, options); +parse_options_usage (stat_usage, options,"o" ,1 ); +parse_options_usage (NULL , options,"log-fd" ,0 ); + goto out; }if (output_fd <0 ) {fprintf (stderr,"argument to --log-fd must be a > 0\n" ); -usage_with_options (stat_usage, options); +parse_options_usage (stat_usage, options,"log-fd" ,0 ); + goto out; }if (!output) {
@@ -1656,7 +1659,9 @@ int cmd_stat(int argc, const char **argv, const char *prefix __maybe_unused)/* User explicitly passed -B? */ if (big_num_opt ==1 ) {fprintf (stderr,"-B option not supported with -x\n" ); -usage_with_options (stat_usage, options); +parse_options_usage (stat_usage, options,"B" ,1 ); +parse_options_usage (NULL , options,"x" ,1 ); + goto out; }else /* Nope, so disable big number formatting */ big_num = false; }else if (big_num_opt ==0 )/* User passed --no-big-num */
@@ -1666,7 +1671,9 @@ int cmd_stat(int argc, const char **argv, const char *prefix __maybe_unused)usage_with_options (stat_usage, options);if (run_count <0 ) { -usage_with_options (stat_usage, options); +pr_err ("Run count must be a positive number\n" ); +parse_options_usage (stat_usage, options,"r" ,1 ); + goto out; }else if (run_count ==0 ) { forever = true; run_count =1 ;
@@ -1678,8 +1685,10 @@ int cmd_stat(int argc, const char **argv, const char *prefix __maybe_unused)fprintf (stderr,"both cgroup and no-aggregation " "modes only available in system-wide mode\n" ); -usage_with_options (stat_usage, options); -return -1 ; +parse_options_usage (stat_usage, options,"G" ,1 ); +parse_options_usage (NULL , options,"A" ,1 ); +parse_options_usage (NULL , options,"a" ,1 ); + goto out; }if (add_default_attributes ())
@@ -1688,25 +1697,28 @@ int cmd_stat(int argc, const char **argv, const char *prefix __maybe_unused)perf_target__validate (&target);if (perf_evlist__create_maps (evsel_list, &target) <0 ) { -if (perf_target__has_task (&target)) +if (perf_target__has_task (&target)) {pr_err ("Problems finding threads of monitor\n" ); -if (perf_target__has_cpu (&target)) +parse_options_usage (stat_usage, options,"p" ,1 ); +parse_options_usage (NULL , options,"t" ,1 ); + }else if (perf_target__has_cpu (&target)) {perror ("failed to parse CPUs map" ); - -usage_with_options (stat_usage, options); -return -1 ; +parse_options_usage (stat_usage, options,"C" ,1 ); +parse_options_usage (NULL , options,"a" ,1 ); + } + goto out; }if (interval && interval <100 ) {pr_err ("print interval must be >= 100ms\n" ); -usage_with_options (stat_usage, options); -return -1 ; +parse_options_usage (stat_usage, options,"I" ,1 ); + goto out_free_maps; }if (perf_evlist__alloc_stats (evsel_list, interval)) goto out_free_maps;if (perf_stat_init_aggr_mode ()) - goto out; + goto out_free_maps;/* * We dont want to block the signals - that would cause
tools/perf/util/parse-options.c +2 -1
@@ -569,7 +569,7 @@ int parse_options_usage(const char * const *usagestr, const char *optstr, bool short_opt) { if (!usagestr) - return PARSE_OPT_HELP; + goto opt;fprintf (stderr,"\n usage: %s\n" , *usagestr++);while (*usagestr && **usagestr)
@@ -582,6 +582,7 @@ int parse_options_usage(const char * const *usagestr, }fputc ('\n' , stderr); +opt:for ( ; opts->type !=OPTION_END ; opts++) {if (short_opt) {if (opts->short_name == *optstr)
Quoted 24 lines · Namhyung Kim
Hi,
This patchset tries to enhance error message when perf failed to parse option argument. Currently it just shows entire usage and options which may fill two pages of screen. It's hard for me to say it's really helpful to users. ;-)
With this patch series, it changed to show only related option(s). There're also more points to improve yet - like auto-breaking long lines, dealing with UIs and so on. But I believe this will be a good start.
$ perf report -g helpusage: perf report [<options>]
-g, --call-graph <output_type,min_percent[,print_limit],call_order>
Display callchains usingoutput_type(graph, flat, fractal, or none) , min percent threshold, optional print limit, callchain order, key (function or address). Default: fractal,0.5,callee,function$ perf stat -Bx, ls -B option not supported with -xusage: perf stat [<options>] [<command>]
Quoted 8 lines
-B, --big-num print large numbers with thousands' separators
-x, --field-separator <separator>
print counts with custom separatorYou can get this on 'perf/option-v1' branch in my tree
git://git.kernel.org/pub/scm/linux/kernel/git/namhyung/linux-perf.git
Cool!
/me runs out of tags
Thanks!
Ingo