perf data: Correct -h output.
Ian Rogers
reviewerPATCH 1/1 perf data: Correct -h output.
From: Joshua Martinez <[email protected]>
There is currently only 1 perf data command, but supporting extra commands was breaking the help output. Simplify for now so that the help output is correct.
Before:
$ perf data -h
Usage: perf data [<common options>] <command> [<options>]
$ perf data
Usage:
perf data [<common options>] <command> [<options>] Available commands:
convert - converts data file between formats
After:
$ perf data
Usage: perf data convert [<options>]
-f, --force don't complain, do it
-i, --input <file> input file name
-v, --verbose be more verbose
--all Convert all events
--to-ctf ... Convert to CTF format
--to-json ... Convert to JSON format
--tod Convert time to wall clock time$ perf data -h
Usage: perf data convert [<options>]
-f, --force don't complain, do it
-i, --input <file> input file name
-v, --verbose be more verbose
--all Convert all events
--to-ctf ... Convert to CTF format
--to-json ... Convert to JSON format
--tod Convert time to wall clock time--- tools/perf/builtin-data.c | 62 ++++++++++++--------------------------- 1 file changed, 19 insertions(+), 43 deletions(-)
tools/perf/builtin-data.c +19 -43
@@ -21,46 +21,21 @@ static struct data_cmd data_cmds[];#define for_each_cmd (cmd) \ for (cmd = data_cmds; cmd && cmd->name; cmd++) -static const struct option data_options[] = { -OPT_END () -}; -static const char *const data_subcommands[] = {"convert" ,NULL };static const char *data_usage[] = { -"perf data [<common options>] <command> [<options>]" , +"perf data convert [<options>]" ,NULL }; -static void print_usage (void ) -{ -struct data_cmd *cmd; - -printf ("Usage:\n" ); -printf ("\t%s\n\n" , data_usage[0 ]); -printf ("\tAvailable commands:\n" ); - -for_each_cmd (cmd) { -printf ("\t %s\t- %s\n" , cmd->name, cmd->summary); - } - -printf ("\n" ); -} - -static const char *const data_convert_usage[] = { -"perf data convert [<options>]" , -NULL +const char *to_json; +const char *to_ctf; +struct perf_data_convert_opts opts = { + .force = false, + .all = false, }; -static int cmd_data_convert (int argc,const char **argv) -{ -const char *to_json =NULL ; -const char *to_ctf =NULL ; -struct perf_data_convert_opts opts = { - .force = false, - .all = false, - }; -const struct option options[] = { +const struct option data_options[] = {OPT_INCR ('v' ,"verbose" , &verbose,"be more verbose" ),OPT_STRING ('i' ,"input" , &input_name,"file" ,"input file name" ),OPT_STRING (0 ,"to-json" , &to_json,NULL ,"Convert to JSON format" ),
@@ -73,10 +48,13 @@ static int cmd_data_convert(int argc, const char **argv) OPT_END() }; - argc =parse_options (argc, argv, options, - data_convert_usage,0 ); +static int cmd_data_convert (int argc,const char **argv) +{ + + argc =parse_options (argc, argv, data_options, + data_usage,0 );if (argc) { -usage_with_options (data_convert_usage, options); +usage_with_options (data_usage, data_options);return -1 ; }
@@ -116,14 +94,13 @@ int cmd_data(int argc, const char **argv)struct data_cmd *cmd;const char *cmdstr; -/* No command specified. */ -if (argc <2 ) - goto usage; - argc =parse_options_subcommand (argc, argv, data_options, data_subcommands, data_usage,PARSE_OPT_STOP_AT_NON_OPTION ); -if (argc <1 ) - goto usage; + +if (!argc) { +usage_with_options (data_usage, data_options); +return -1 ; + } cmdstr = argv[0 ];
@@ -135,7 +112,6 @@ int cmd_data(int argc, const char **argv) }pr_err ("Unknown command: %s\n" , cmdstr); -usage: -print_usage (); +usage_with_options (data_usage, data_options);return -1 ; }
Signature · 1 line
2.33.0.rc2.250.ged5fa647cd-goog
Em Tue, Aug 24, 2021 at 01:58:29PM -0700, Ian Rogers escreveu:
Quoted 8 lines
From: Joshua Martinez <[email protected]>
There is currently only 1 perf data command, but supporting extra commands was breaking the help output. Simplify for now so that the help output is correct.
Before:
$ perf data -h
Thanks, applied.
- Arnaldo