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>
diff --git a/Documentation/perf_counter/builtin-help.c b/Documentation/perf_counter/builtin-help.c
index a3894bf..0f32dc3 100644
--- a/Documentation/perf_counter/builtin-help.c
+++ b/Documentation/perf_counter/builtin-help.c
@@ -284,7 +284,7 @@
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 @@
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;
}
diff --git a/Documentation/perf_counter/command-list.txt b/Documentation/perf_counter/command-list.txt
index 4390292..f0b922c 100644
--- a/Documentation/perf_counter/command-list.txt
+++ b/Documentation/perf_counter/command-list.txt
@@ -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
diff --git a/Documentation/perf_counter/perf.c b/Documentation/perf_counter/perf.c
index 9ac7565..161824f 100644
--- a/Documentation/perf_counter/perf.c
+++ b/Documentation/perf_counter/perf.c
@@ -384,9 +384,9 @@
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];
diff --git a/Documentation/perf_counter/util/parse-options.c b/Documentation/perf_counter/util/parse-options.c
index 551b6bc..e4d3533 100644
--- a/Documentation/perf_counter/util/parse-options.c
+++ b/Documentation/perf_counter/util/parse-options.c
@@ -385,7 +385,7 @@
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) {
diff --git a/Documentation/perf_counter/util/usage.c b/Documentation/perf_counter/util/usage.c
index 7a10421..2cad286 100644
--- a/Documentation/perf_counter/util/usage.c
+++ b/Documentation/perf_counter/util/usage.c
@@ -14,7 +14,7 @@
static NORETURN void usage_builtin(const char *err)
{
- fprintf(stderr, "usage: %s\n", err);
+ fprintf(stderr, "\n usage: %s\n", err);
exit(129);
}