From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756232AbbCSRIZ (ORCPT ); Thu, 19 Mar 2015 13:08:25 -0400 Received: from mail.kernel.org ([198.145.29.136]:44909 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751944AbbCSRG5 (ORCPT ); Thu, 19 Mar 2015 13:06:57 -0400 From: Arnaldo Carvalho de Melo To: Ingo Molnar Cc: linux-kernel@vger.kernel.org, Yunlong Song , Paul Mackerras , Peter Zijlstra , Wang Nan , Arnaldo Carvalho de Melo Subject: [PATCH 27/31] perf tools: Add the bash completion for listing subsubcommands of perf timechart Date: Thu, 19 Mar 2015 14:05:03 -0300 Message-Id: <1426784707-19466-28-git-send-email-acme@kernel.org> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1426784707-19466-1-git-send-email-acme@kernel.org> References: <1426784707-19466-1-git-send-email-acme@kernel.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Yunlong Song The bash completion does not support listing subsubcommands for 'perf timechart ', so fix it. Example: Before this patch: $ perf timechart $ As shown above, the subsubcommands of perf timechart does not come out. After this patch: $ perf timechart record As shown above, the subsubcommands of perf timechart 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-12-git-send-email-yunlong.song@huawei.com Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/builtin-timechart.c | 7 ++++--- tools/perf/perf-completion.sh | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/tools/perf/builtin-timechart.c b/tools/perf/builtin-timechart.c index 51440d1fc722..494b3bbe5ea4 100644 --- a/tools/perf/builtin-timechart.c +++ b/tools/perf/builtin-timechart.c @@ -1958,7 +1958,8 @@ int cmd_timechart(int argc, const char **argv, parse_time), OPT_END() }; - const char * const timechart_usage[] = { + const char * const timechart_subcommands[] = { "record", NULL }; + const char *timechart_usage[] = { "perf timechart [] {record}", NULL }; @@ -1976,8 +1977,8 @@ int cmd_timechart(int argc, const char **argv, "perf timechart record []", NULL }; - argc = parse_options(argc, argv, timechart_options, timechart_usage, - PARSE_OPT_STOP_AT_NON_OPTION); + argc = parse_options_subcommand(argc, argv, timechart_options, timechart_subcommands, + timechart_usage, PARSE_OPT_STOP_AT_NON_OPTION); if (tchart.power_only && tchart.tasks_only) { pr_err("-P and -T options cannot be used at the same time.\n"); diff --git a/tools/perf/perf-completion.sh b/tools/perf/perf-completion.sh index 35f43fd7a38b..a33d2ef53ae4 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|data|help|script|test) ]]; then + if [[ $prev_skip_opts == @(kvm|kmem|mem|lock|sched|data|help|script|test|timechart) ]]; then subcmds=$($cmd $prev_skip_opts --list-cmds) __perfcomp_colon "$subcmds" "$cur" fi -- 1.9.3