From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752302AbbCVKJj (ORCPT ); Sun, 22 Mar 2015 06:09:39 -0400 Received: from terminus.zytor.com ([198.137.202.10]:57019 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751739AbbCVKJg (ORCPT ); Sun, 22 Mar 2015 06:09:36 -0400 Date: Sun, 22 Mar 2015 03:09:12 -0700 From: tip-bot for Yunlong Song Message-ID: Cc: yunlong.song@huawei.com, linux-kernel@vger.kernel.org, acme@redhat.com, tglx@linutronix.de, hpa@zytor.com, a.p.zijlstra@chello.nl, mingo@kernel.org, wangnan0@huawei.com, paulus@samba.org Reply-To: wangnan0@huawei.com, paulus@samba.org, linux-kernel@vger.kernel.org, yunlong.song@huawei.com, acme@redhat.com, tglx@linutronix.de, hpa@zytor.com, a.p.zijlstra@chello.nl, mingo@kernel.org In-Reply-To: <1426685758-25488-2-git-send-email-yunlong.song@huawei.com> References: <1426685758-25488-2-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 options of perf subcommand Git-Commit-ID: 02fde323b9aaebb4a21e7c0e04759470b6c07594 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: 02fde323b9aaebb4a21e7c0e04759470b6c07594 Gitweb: http://git.kernel.org/tip/02fde323b9aaebb4a21e7c0e04759470b6c07594 Author: Yunlong Song AuthorDate: Wed, 18 Mar 2015 21:35:46 +0800 Committer: Arnaldo Carvalho de Melo CommitDate: Thu, 19 Mar 2015 13:48:56 -0300 perf tools: Fix the bash completion for listing options of perf subcommand The bash completion does not support listing options for 'perf kvm|kmem|mem|lock|sched --', where 'kvm|kmem|mem|lock|sched' are all subcommands of perf. Example: Before this patch: $ perf kvm -- $ As shown above, the options of perf kvm does not come out. After this patch: $ perf kvm -- --alloc --caller --input --line --raw-ip --sort --verbose As shown above, the options of perf kvm 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-2-git-send-email-yunlong.song@huawei.com Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/perf-completion.sh | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/tools/perf/perf-completion.sh b/tools/perf/perf-completion.sh index c2595e9..4822ed3 100644 --- a/tools/perf/perf-completion.sh +++ b/tools/perf/perf-completion.sh @@ -119,15 +119,18 @@ __perf_main () elif [[ $prev == "-e" && "${words[1]}" == @(record|stat|top) ]]; then evts=$($cmd list --raw-dump) __perfcomp_colon "$evts" "$cur" - # List subcommands for perf commands - elif [[ $prev == @(kvm|kmem|mem|lock|sched) ]]; then - subcmds=$($cmd $prev --list-cmds) - __perfcomp_colon "$subcmds" "$cur" - # List long option names - elif [[ $cur == --* ]]; then - subcmd=${words[1]} - opts=$($cmd $subcmd --list-opts) - __perfcomp "$opts" "$cur" + else + # List subcommands for perf commands + if [[ $prev == @(kvm|kmem|mem|lock|sched) ]]; then + subcmds=$($cmd $prev --list-cmds) + __perfcomp_colon "$subcmds" "$cur" + fi + # List long option names + if [[ $cur == --* ]]; then + subcmd=${words[1]} + opts=$($cmd $subcmd --list-opts) + __perfcomp "$opts" "$cur" + fi fi }