perf_counter tools: Uniform help printouts
Commit-ID: 502fc5c72a886ff9d4d7a596e65ecc4dd5e4d458 Gitweb: http://git.kernel.org/tip/502fc5c72a886ff9d4d7a596e65ecc4dd5e4d458 Author: Ingo Molnar <[email protected]> AuthorDate: Fri, 13 Mar 2009 03:20:49 +0100 Committer: Ingo Molnar <[email protected]> CommitDate: Sat, 6 Jun 2009 14:41:49 +0200
perf_counter tools: Uniform help printouts
Also add perf list to command-list.txt.
Cc: Peter Zijlstra <[email protected]>
Cc: Mike Galbraith <[email protected]>
Cc: Paul Mackerras <[email protected]>
Cc: Arnaldo Carvalho de Melo <[email protected]>
LKML-Reference: <new-submission>
Signed-off-by Ingo Molnar <[email protected]>
--- Documentation/perf_counter/builtin-help.c | 10 +++++----- Documentation/perf_counter/command-list.txt | 14 ++++++++------ Documentation/perf_counter/perf.c | 4 ++-- Documentation/perf_counter/util/parse-options.c | 2 +- Documentation/perf_counter/util/usage.c | 2 +- 5 files changed, 17 insertions(+), 15 deletions(-)
Documentation/perf_counter/builtin-help.c +5 -5
@@ -284,7 +284,7 @@ void list_common_cmds_help(void) longest =strlen (common_cmds[i].name); } -puts ("The most commonly used perf commands are:" ); +puts (" The most commonly used perf commands are:" );for (i =0 ; i <ARRAY_SIZE (common_cmds); i++) {printf (" %s " , common_cmds[i].name);mput_char (' ' , longest -strlen (common_cmds[i].name));
@@ -426,16 +426,16 @@ int cmd_help(int argc, const char **argv, const char *prefix) builtin_help_usage, 0);if (show_all) { -printf ("usage: %s\n\n" , perf_usage_string); +printf ("\n usage: %s\n\n" , perf_usage_string);list_commands ("perf commands" , &main_cmds, &other_cmds); -printf ("%s\n" , perf_more_info_string); +printf (" %s\n\n" , perf_more_info_string);return 0 ; }if (!argv[0 ]) { -printf ("usage: %s\n\n" , perf_usage_string); +printf ("\n usage: %s\n\n" , perf_usage_string);list_common_cmds_help (); -printf ("\n%s\n" , perf_more_info_string); +printf ("\n %s\n\n" , perf_more_info_string);return 0 ; }
Documentation/perf_counter/command-list.txt +8 -6
@@ -1,7 +1,9 @@ +# # List of known perf commands. -# command name category [deprecated] [common] -perf-record mainporcelain common -perf-report mainporcelain common -perf-stat mainporcelain common -perf-top mainporcelain common - +# command name category [deprecated] [common] +# +perf-record mainporcelain common +perf-report mainporcelain common +perf-stat mainporcelain common +perf-top mainporcelain common +perf-list mainporcelain common
Documentation/perf_counter/perf.c +2 -2
@@ -384,9 +384,9 @@ int main(int argc, const char **argv) argv[0 ] +=2 ; }else {/* The user didn't specify a command; give them help */ -printf ("usage: %s\n\n" , perf_usage_string); +printf ("\n usage: %s\n\n" , perf_usage_string);list_common_cmds_help (); -printf ("\n%s\n" , perf_more_info_string); +printf ("\n %s\n\n" , perf_more_info_string);exit (1 ); } cmd = argv[0 ];
Documentation/perf_counter/util/parse-options.c +1 -1
@@ -385,7 +385,7 @@ int usage_with_options_internal(const char * const *usagestr,if (!usagestr)return PARSE_OPT_HELP ; -fprintf (stderr,"usage: %s\n" , *usagestr++); +fprintf (stderr,"\n usage: %s\n" , *usagestr++);while (*usagestr && **usagestr)fprintf (stderr," or: %s\n" , *usagestr++);while (*usagestr) {
Documentation/perf_counter/util/usage.c +1 -1
@@ -14,7 +14,7 @@ static void report(const char *prefix, const char *err, va_list params) static NORETURN void usage_builtin(const char *err) { -fprintf (stderr,"usage: %s\n" , err); +fprintf (stderr,"\n usage: %s\n" , err);exit (129 ); }