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

Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
Acked-by: David Ahern <dsahern@gmail.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Link: http://lkml.kernel.org/r/1394853474-31019-4-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-lock.c b/tools/perf/builtin-lock.c
index c852c7a85d3236e86781b15616858a76b56c6206..6148afc995c68a0bd11b61826a741185a69e4294 100644 (file)
--- a/tools/perf/builtin-lock.c
+++ b/tools/perf/builtin-lock.c
@@ -961,8 +961,10 @@ int cmd_lock(int argc, const char **argv, const char *prefix __maybe_unused)
                "perf lock info [<options>]",
                NULL
        };
-       const char * const lock_usage[] = {
-               "perf lock [<options>] {record|report|script|info}",
+       const char *const lock_subcommands[] = { "record", "report", "script",
+                                                "info", NULL };
+       const char *lock_usage[] = {
+               NULL,
                NULL
        };
        const char * const report_usage[] = {
@@ -976,8 +978,8 @@ int cmd_lock(int argc, const char **argv, const char *prefix __maybe_unused)
        for (i = 0; i < LOCKHASH_SIZE; i++)
                INIT_LIST_HEAD(lockhash_table + i);
 
-       argc = parse_options(argc, argv, lock_options, lock_usage,
-                            PARSE_OPT_STOP_AT_NON_OPTION);
+       argc = parse_options_subcommand(argc, argv, lock_options, lock_subcommands,
+                                       lock_usage, PARSE_OPT_STOP_AT_NON_OPTION);
        if (!argc)
                usage_with_options(lock_usage, lock_options);
 

diff --git a/tools/perf/perf-completion.sh b/tools/perf/perf-completion.sh
index f44c04b1015d414e0f8e31d94f5f62b1d6957a12..ecedab6524e44d001bcffd814b2e356deb48c861 100644 (file)
--- a/tools/perf/perf-completion.sh
+++ b/tools/perf/perf-completion.sh
@@ -122,7 +122,7 @@ __perf_main ()
                evts=$($cmd list --raw-dump)
                __perfcomp_colon "$evts" "$cur"
        # List subcommands for perf commands
-       elif [[ $prev == @(kvm|kmem|mem) ]]; then
+       elif [[ $prev == @(kvm|kmem|mem|lock) ]]; then
                subcmds=$($cmd $prev --list-cmds)
                __perfcomp_colon "$subcmds" "$cur"
        # List long option names