All of lore.kernel.org
 help / color / mirror / Atom feed
From: Andi Kleen <andi@firstfloor.org>
To: acme@kernel.org
Cc: jolsa@kernel.org, linux-kernel@vger.kernel.org,
	Andi Kleen <ak@linux.intel.com>
Subject: [PATCH 3/3] perf, tools: Fix completion script to handle comma list
Date: Tue, 18 Oct 2016 16:21:01 -0700	[thread overview]
Message-ID: <1476832861-7936-3-git-send-email-andi@firstfloor.org> (raw)
In-Reply-To: <1476832861-7936-1-git-send-email-andi@firstfloor.org>

From: Andi Kleen <ak@linux.intel.com>

The perf event completion script only handled a single event per
-e option. So for "perf stat -e cycles,branches" branches could
not be completed.

Fix that issue by always only using the last suffix for completion.

For some reason it only works in bash currently, but zsh
is the same as before.

v2: Handle conflict with upper case completion patch
Signed-off-by: Andi Kleen <ak@linux.intel.com>
---
 tools/perf/perf-completion.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tools/perf/perf-completion.sh b/tools/perf/perf-completion.sh
index 72391ff68f66..582513e004f9 100644
--- a/tools/perf/perf-completion.sh
+++ b/tools/perf/perf-completion.sh
@@ -166,7 +166,11 @@ __perf_main ()
 			[[:upper:]]*) evts=$($cmd list --raw-dump vendor | tr a-z A-Z) ;;
 			*) evts=$($cmd list --raw-dump) ;;
 		esac
+		old="$cur"
+		cur="${cur/*[,{]/}"
+		prefix=${old%$cur}
 		__perfcomp_colon "$evts" "$cur"
+		COMPREPLY=("${prefix}${COMPREPLY[0]}")
 	else
 		# List subcommands for perf commands
 		if [[ $prev_skip_opts == @(kvm|kmem|mem|lock|sched|
-- 
2.5.5

  parent reply	other threads:[~2016-10-18 23:21 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-10-18 23:20 [PATCH 1/3] perf, tools: Add support for perf list vendor Andi Kleen
2016-10-18 23:21 ` [PATCH 2/3] perf, tools: Handle completion of upper case events Andi Kleen
2016-10-18 23:21 ` Andi Kleen [this message]
  -- strict thread matches above, loose matches on Subject: below --
2016-10-06 19:23 [PATCH 1/3] perf, tools: Add support for perf list json Andi Kleen
2016-10-06 19:23 ` [PATCH 3/3] perf, tools: Fix completion script to handle comma list Andi Kleen
2016-10-06 20:05   ` Arnaldo Carvalho de Melo
2016-10-06 20:08     ` Andi Kleen
2016-10-06 20:29       ` Arnaldo Carvalho de Melo
2016-10-06 20:41         ` Andi Kleen

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1476832861-7936-3-git-send-email-andi@firstfloor.org \
    --to=andi@firstfloor.org \
    --cc=acme@kernel.org \
    --cc=ak@linux.intel.com \
    --cc=jolsa@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.