perf_counter tools: Uniform help printouts

Also add perf list to command-list.txt.

Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
LKML-Reference: <new-submission>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Ingo Molnar 2009-03-13 03:20:49 +01:00
parent 386b05e3a2
commit 502fc5c72a
5 changed files with 17 additions and 15 deletions

View File

@ -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;
}

View File

@ -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

View File

@ -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];

View File

@ -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) {

View File

@ -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);
}