Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/core

Pull perf/core improvements and fixes from Arnaldo:

User visible:

  * Add several futex 'perf bench' microbenchmarks (Davidlohr Bueso)

  * Speed up thread map generation (Don Zickus)

  * Fix synthesizing mmaps for threads (Don Zickus)

  * Fix invalid output on event group stdio report  (Namhyung Kim)

  * Introduce 'perf kvm --list-cmds' command line option for use by
    scripts (Ramkumar Ramachandra)

Documentation:

  * Clarify load-latency information in the 'perf mem' docs (Andi Kleen)

  * Clarify x86 register naming in 'perf probe' docs (Andi Kleen)

Refactorings:

  * hists browser refactorings to reuse code accross UIs (Namhyung Kim)

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>

1 files changed, 33 insertions, 4 deletions

diff --git a/tools/perf/util/parse-options.c b/tools/perf/util/parse-options.c
index d22e3f8017dc..bf48092983c6 100644
--- a/tools/perf/util/parse-options.c
+++ b/tools/perf/util/parse-options.c
@@ -407,7 +407,9 @@ int parse_options_step(struct parse_opt_ctx_t *ctx,
                 if (internal_help && !strcmp(arg + 2, "help"))
                         return usage_with_options_internal(usagestr, options, 0);
                 if (!strcmp(arg + 2, "list-opts"))
-                        return PARSE_OPT_LIST;
+                        return PARSE_OPT_LIST_OPTS;
+                if (!strcmp(arg + 2, "list-cmds"))
+                        return PARSE_OPT_LIST_SUBCMDS;
                 switch (parse_long_opt(ctx, arg + 2, options)) {
                 case -1:
                         return parse_options_usage(usagestr, options, arg + 2, 0);
@@ -433,25 +435,45 @@ int parse_options_end(struct parse_opt_ctx_t *ctx)
         return ctx->cpidx + ctx->argc;
 }
 
-int parse_options(int argc, const char **argv, const struct option *options,
-                  const char * const usagestr[], int flags)
+int parse_options_subcommand(int argc, const char **argv, const struct option *options,
+                        const char *const subcommands[], const char *usagestr[], int flags)
 {
         struct parse_opt_ctx_t ctx;
 
         perf_header__set_cmdline(argc, argv);
 
+        /* build usage string if it's not provided */
+        if (subcommands && !usagestr[0]) {
+                struct strbuf buf = STRBUF_INIT;
+
+                strbuf_addf(&buf, "perf %s [<options>] {", argv[0]);
+                for (int i = 0; subcommands[i]; i++) {
+                        if (i)
+                                strbuf_addstr(&buf, "|");
+                        strbuf_addstr(&buf, subcommands[i]);
+                }
+                strbuf_addstr(&buf, "}");
+
+                usagestr[0] = strdup(buf.buf);
+                strbuf_release(&buf);
+        }
+
         parse_options_start(&ctx, argc, argv, flags);
         switch (parse_options_step(&ctx, options, usagestr)) {
         case PARSE_OPT_HELP:
                 exit(129);
         case PARSE_OPT_DONE:
                 break;
-        case PARSE_OPT_LIST:
+        case PARSE_OPT_LIST_OPTS:
                 while (options->type != OPTION_END) {
                         printf("--%s ", options->long_name);
                         options++;
                 }
                 exit(130);
+        case PARSE_OPT_LIST_SUBCMDS:
+                for (int i = 0; subcommands[i]; i++)
+                        printf("%s ", subcommands[i]);
+                exit(130);
         default: /* PARSE_OPT_UNKNOWN */
                 if (ctx.argv[0][1] == '-') {
                         error("unknown option `%s'", ctx.argv[0] + 2);
@@ -464,6 +486,13 @@ int parse_options(int argc, const char **argv, const struct option *options,
         return parse_options_end(&ctx);
 }
 
+int parse_options(int argc, const char **argv, const struct option *options,
+                  const char * const usagestr[], int flags)
+{
+        return parse_options_subcommand(argc, argv, options, NULL,
+                                        (const char **) usagestr, flags);
+}
+
 #define USAGE_OPTS_WIDTH 24
 #define USAGE_GAP         2