From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752342AbbCVKJx (ORCPT ); Sun, 22 Mar 2015 06:09:53 -0400 Received: from terminus.zytor.com ([198.137.202.10]:57045 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752314AbbCVKJu (ORCPT ); Sun, 22 Mar 2015 06:09:50 -0400 Date: Sun, 22 Mar 2015 03:09:29 -0700 From: tip-bot for Yunlong Song Message-ID: Cc: acme@redhat.com, wangnan0@huawei.com, linux-kernel@vger.kernel.org, paulus@samba.org, yunlong.song@huawei.com, tglx@linutronix.de, mingo@kernel.org, a.p.zijlstra@chello.nl, hpa@zytor.com Reply-To: tglx@linutronix.de, mingo@kernel.org, hpa@zytor.com, a.p.zijlstra@chello.nl, wangnan0@huawei.com, acme@redhat.com, yunlong.song@huawei.com, paulus@samba.org, linux-kernel@vger.kernel.org In-Reply-To: <1426685758-25488-3-git-send-email-yunlong.song@huawei.com> References: <1426685758-25488-3-git-send-email-yunlong.song@huawei.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf tools: Fix the bash completion for listing subsubcommands of perf subcommand Git-Commit-ID: 67afff485b2ce742374edb2e17d21e2bc664eb1f 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: 67afff485b2ce742374edb2e17d21e2bc664eb1f Gitweb: http://git.kernel.org/tip/67afff485b2ce742374edb2e17d21e2bc664eb1f Author: Yunlong Song AuthorDate: Wed, 18 Mar 2015 21:35:47 +0800 Committer: Arnaldo Carvalho de Melo CommitDate: Thu, 19 Mar 2015 13:49:20 -0300 perf tools: Fix the bash completion for listing subsubcommands of perf subcommand The bash completion does not support listing subsubcommands for 'perf kvm|kmem|mem|lock|sched -- ', where 'kvm|kmem|mem| lock|sched' are all subcommands of perf. Example: Before this patch: $ perf kvm --verbose $ As shown above, the subsubcommands of perf kvm does not come out. After this patch: $ perf kvm --verbose buildid-list diff record report stat top As shown above, the subsubcommands of perf kvm can come out now. Signed-off-by: Yunlong Song Tested-by: Arnaldo Carvalho de Melo Cc: Peter Zijlstra Cc: Paul Mackerras Cc: Wang Nan Link: http://lkml.kernel.org/r/1426685758-25488-3-git-send-email-yunlong.song@huawei.com Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/perf-completion.sh | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/tools/perf/perf-completion.sh b/tools/perf/perf-completion.sh index 4822ed3..bbb61d0 100644 --- a/tools/perf/perf-completion.sh +++ b/tools/perf/perf-completion.sh @@ -100,6 +100,23 @@ __perfcomp_colon () __ltrim_colon_completions $cur } +__perf_prev_skip_opts () +{ + local i cmd_ cmds_ + + let i=cword-1 + cmds_=$($cmd --list-cmds) + prev_skip_opts=() + while [ $i -ge 0 ]; do + for cmd_ in $cmds_; do + if [[ ${words[i]} == $cmd_ ]]; then + prev_skip_opts=${words[i]} + return + fi + done + ((i--)) + done +} __perf_main () { local cmd @@ -107,6 +124,8 @@ __perf_main () cmd=${words[0]} COMPREPLY=() + # Skip options backward and find the last perf command + __perf_prev_skip_opts # List perf subcommands or long options if [ $cword -eq 1 ]; then if [[ $cur == --* ]]; then @@ -121,8 +140,8 @@ __perf_main () __perfcomp_colon "$evts" "$cur" else # List subcommands for perf commands - if [[ $prev == @(kvm|kmem|mem|lock|sched) ]]; then - subcmds=$($cmd $prev --list-cmds) + if [[ $prev_skip_opts == @(kvm|kmem|mem|lock|sched) ]]; then + subcmds=$($cmd $prev_skip_opts --list-cmds) __perfcomp_colon "$subcmds" "$cur" fi # List long option names