perf list: Avoid confusion of perf output and the next command prompt

Distinguish the output of 'perf list --list-opts' or 'perf --list-cmds'
with the next command prompt, which also happens in other cases (e.g.
record, report ...).

Example:

Before this patch:

 $perf list --list-opts
 --raw-dump $          <-- the output and the next command prompt are at
                           the same line

After this patch:

 $perf list --list-opts
 --raw-dump
 $                     <-- the new line

Signed-off-by: Yunlong Song <[email protected]>
Cc: Paul Mackerras <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Cc: Wang Nan <[email protected]>
Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>

diff --git a/tools/perf/perf.c b/tools/perf/perf.c
index f3c66b81c6bee9b2cb57e2c36939df8bf533d090..3df2665022bef0db98455a9f31ad24ec0ea5b314 100644 (file)
--- a/tools/perf/perf.c
+++ b/tools/perf/perf.c
@@ -223,6 +223,7 @@ static int handle_options(const char ***argv, int *argc, int *envchanged)
                                struct cmd_struct *p = commands+i;
                                printf("%s ", p->cmd);
                        }
+                       putchar('\n');
                        exit(0);
                } else if (!strcmp(cmd, "--debug")) {
                        if (*argc < 2) {

diff --git a/tools/perf/util/parse-options.c b/tools/perf/util/parse-options.c
index 4ee9a86705ed3a84d02dda86ff20e1099078c853..b0ef2d813d2f6bacb6bf683293cbab06b1ccaf60 100644 (file)
--- a/tools/perf/util/parse-options.c
+++ b/tools/perf/util/parse-options.c
@@ -508,12 +508,14 @@ int parse_options_subcommand(int argc, const char **argv, const struct option *o
                        printf("--%s ", options->long_name);
                        options++;
                }
+               putchar('\n');
                exit(130);
        case PARSE_OPT_LIST_SUBCMDS:
                if (subcommands) {
                        for (int i = 0; subcommands[i]; i++)
                                printf("%s ", subcommands[i]);
                }
+               putchar('\n');
                exit(130);
        default: /* PARSE_OPT_UNKNOWN */
                if (ctx.argv[0][1] == '-') {