perf kmem: Introduce --list-cmds for use by scripts

Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
Acked-by: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Link: http://lkml.kernel.org/r/1394853474-31019-2-git-send-email-artagnon@gmail.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Jiri Olsa <jolsa@redhat.com>

diff --git a/tools/perf/builtin-kmem.c b/tools/perf/builtin-kmem.c
index 929462aa494351f5f237eaa03ce0042146853945..bd91de07d2a9ead0acf9dea7bb6f674f6a83e737 100644 (file)
--- a/tools/perf/builtin-kmem.c
+++ b/tools/perf/builtin-kmem.c
@@ -756,11 +756,13 @@ int cmd_kmem(int argc, const char **argv, const char *prefix __maybe_unused)
        OPT_BOOLEAN(0, "raw-ip", &raw_ip, "show raw ip instead of symbol"),
        OPT_END()
        };
-       const char * const kmem_usage[] = {
-               "perf kmem [<options>] {record|stat}",
+       const char *const kmem_subcommands[] = { "record", "stat", NULL };
+       const char *kmem_usage[] = {
+               NULL,
                NULL
        };
-       argc = parse_options(argc, argv, kmem_options, kmem_usage, 0);
+       argc = parse_options_subcommand(argc, argv, kmem_options,
+                                       kmem_subcommands, kmem_usage, 0);
 
        if (!argc)
                usage_with_options(kmem_usage, kmem_options);

diff --git a/tools/perf/perf-completion.sh b/tools/perf/perf-completion.sh
index ae3a57694b6bda9937146c25e291ab9a80929ce7..0ef59dd4c78d83229f13dffeec24552504bc6fd3 100644 (file)
--- a/tools/perf/perf-completion.sh
+++ b/tools/perf/perf-completion.sh
@@ -121,8 +121,8 @@ __perf_main ()
        elif [[ $prev == "-e" && "${words[1]}" == @(record|stat|top) ]]; then
                evts=$($cmd list --raw-dump)
                __perfcomp_colon "$evts" "$cur"
-       # List subcommands for 'perf kvm'
-       elif [[ $prev == "kvm" ]]; then
+       # List subcommands for perf commands
+       elif [[ $prev == @(kvm|kmem) ]]; then
                subcmds=$($cmd $prev --list-cmds)
                __perfcomp_colon "$subcmds" "$cur"
        # List long option names