From: Yunlong Song <yunlong.s...@huawei.com> The bash completion does not support listing subsubcommands for 'perf data <TAB>', so fix it.
Example: Before this patch: $ perf data <TAB> $ As shown above, the subsubcommands of perf data does not come out. After this patch: $ perf data <TAB> convert As shown above, the subsubcommands of perf data can come out now. Signed-off-by: Yunlong Song <yunlong.s...@huawei.com> Tested-by: Arnaldo Carvalho de Melo <a...@redhat.com> Cc: Paul Mackerras <pau...@samba.org> Cc: Peter Zijlstra <a.p.zijls...@chello.nl> Cc: Wang Nan <wangn...@huawei.com> Link: http://lkml.kernel.org/r/1426685758-25488-8-git-send-email-yunlong.s...@huawei.com Signed-off-by: Arnaldo Carvalho de Melo <a...@redhat.com> --- tools/perf/builtin-data.c | 6 ++++-- tools/perf/perf-completion.sh | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/tools/perf/builtin-data.c b/tools/perf/builtin-data.c index 155cf75b8199..709152a7b408 100644 --- a/tools/perf/builtin-data.c +++ b/tools/perf/builtin-data.c @@ -22,7 +22,9 @@ static const struct option data_options[] = { OPT_END() }; -static const char * const data_usage[] = { +static const char * const data_subcommands[] = { "convert", NULL }; + +static const char *data_usage[] = { "perf data [<common options>] <command> [<options>]", NULL }; @@ -98,7 +100,7 @@ int cmd_data(int argc, const char **argv, const char *prefix) if (argc < 2) goto usage; - argc = parse_options(argc, argv, data_options, data_usage, + argc = parse_options_subcommand(argc, argv, data_options, data_subcommands, data_usage, PARSE_OPT_STOP_AT_NON_OPTION); if (argc < 1) goto usage; diff --git a/tools/perf/perf-completion.sh b/tools/perf/perf-completion.sh index 7b98ae48f0bf..535ff72babc7 100644 --- a/tools/perf/perf-completion.sh +++ b/tools/perf/perf-completion.sh @@ -143,7 +143,7 @@ __perf_main () __perfcomp_colon "$evts" "$cur" else # List subcommands for perf commands - if [[ $prev_skip_opts == @(kvm|kmem|mem|lock|sched) ]]; then + if [[ $prev_skip_opts == @(kvm|kmem|mem|lock|sched|data) ]]; then subcmds=$($cmd $prev_skip_opts --list-cmds) __perfcomp_colon "$subcmds" "$cur" fi -- 1.9.3 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
