From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752493AbbCVKLW (ORCPT ); Sun, 22 Mar 2015 06:11:22 -0400 Received: from terminus.zytor.com ([198.137.202.10]:57112 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751909AbbCVKLT (ORCPT ); Sun, 22 Mar 2015 06:11:19 -0400 Date: Sun, 22 Mar 2015 03:11:01 -0700 From: tip-bot for Yunlong Song Message-ID: Cc: hpa@zytor.com, mingo@kernel.org, wangnan0@huawei.com, paulus@samba.org, tglx@linutronix.de, linux-kernel@vger.kernel.org, acme@redhat.com, a.p.zijlstra@chello.nl, yunlong.song@huawei.com Reply-To: hpa@zytor.com, mingo@kernel.org, a.p.zijlstra@chello.nl, yunlong.song@huawei.com, linux-kernel@vger.kernel.org, acme@redhat.com, paulus@samba.org, tglx@linutronix.de, wangnan0@huawei.com In-Reply-To: <1426685758-25488-8-git-send-email-yunlong.song@huawei.com> References: <1426685758-25488-8-git-send-email-yunlong.song@huawei.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf tools: Add the bash completion for listing subsubcommands of perf data Git-Commit-ID: 01b7160bc6674912f6b7043bbf58d66e62e41054 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 01b7160bc6674912f6b7043bbf58d66e62e41054 Gitweb: http://git.kernel.org/tip/01b7160bc6674912f6b7043bbf58d66e62e41054 Author: Yunlong Song AuthorDate: Wed, 18 Mar 2015 21:35:52 +0800 Committer: Arnaldo Carvalho de Melo CommitDate: Thu, 19 Mar 2015 13:49:38 -0300 perf tools: Add the bash completion for listing subsubcommands of perf data The bash completion does not support listing subsubcommands for 'perf data ', so fix it. Example: Before this patch: $ perf data $ As shown above, the subsubcommands of perf data does not come out. After this patch: $ perf data convert As shown above, the subsubcommands of perf data can come out now. Signed-off-by: Yunlong Song Tested-by: Arnaldo Carvalho de Melo Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Wang Nan Link: http://lkml.kernel.org/r/1426685758-25488-8-git-send-email-yunlong.song@huawei.com Signed-off-by: Arnaldo Carvalho de Melo --- 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 155cf75..709152a 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 [] []", 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 7b98ae4..535ff72 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