From: Arnaldo Carvalho de Melo <acme@infradead.org>
To: Ingo Molnar <mingo@kernel.org>
Cc: linux-kernel@vger.kernel.org, Namhyung Kim <namhyung.kim@lge.com>,
Namhyung Kim <namhyung@kernel.org>,
David Ahern <dsahern@gmail.com>,
Frederic Weisbecker <fweisbec@gmail.com>,
Paul Mackerras <paulus@samba.org>,
Peter Zijlstra <a.p.zijlstra@chello.nl>,
Arnaldo Carvalho de Melo <acme@redhat.com>
Subject: [PATCH 33/42] perf tools: Complete tracepoint event names
Date: Thu, 4 Oct 2012 15:08:33 -0300 [thread overview]
Message-ID: <1349374122-27806-34-git-send-email-acme@infradead.org> (raw)
In-Reply-To: <1349374122-27806-1-git-send-email-acme@infradead.org>
From: Namhyung Kim <namhyung.kim@lge.com>
Currently tracepoint events cannot be completed because they contain a
colon (:) character. The colon is considered as a word separator when
bash completion is done - variable COMP_WORDBREAKS contains colon - so
if a word being completed contains a colon it can be a problem.
Recent versions of bash completion provide -n switch to
_get_comp_words_by_ref and __ltrim_colon_completions functions in order
to resolve this issue. Copy the latter in case not exists.
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1349328234-16995-1-git-send-email-namhyung@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/bash_completion | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/tools/perf/bash_completion b/tools/perf/bash_completion
index 5c355ab..56e6a12 100644
--- a/tools/perf/bash_completion
+++ b/tools/perf/bash_completion
@@ -6,6 +6,19 @@ function_exists()
return $?
}
+function_exists __ltrim_colon_completions ||
+__ltrim_colon_completions()
+{
+ if [[ "$1" == *:* && "$COMP_WORDBREAKS" == *:* ]]; then
+ # Remove colon-word prefix from COMPREPLY items
+ local colon_word=${1%${1##*:}}
+ local i=${#COMPREPLY[*]}
+ while [[ $((--i)) -ge 0 ]]; do
+ COMPREPLY[$i]=${COMPREPLY[$i]#"$colon_word"}
+ done
+ fi
+}
+
have perf &&
_perf()
{
@@ -13,9 +26,9 @@ _perf()
COMPREPLY=()
if function_exists _get_comp_words_by_ref; then
- _get_comp_words_by_ref cur prev
+ _get_comp_words_by_ref -n : cur prev
else
- cur=$(_get_cword)
+ cur=$(_get_cword :)
prev=${COMP_WORDS[COMP_CWORD-1]}
fi
@@ -35,6 +48,7 @@ _perf()
elif [[ $prev == "-e" && "${COMP_WORDS[1]}" == @(record|stat|top) ]]; then
evts=$($cmd list --raw-dump)
COMPREPLY=( $( compgen -W '$evts' -- "$cur" ) )
+ __ltrim_colon_completions $cur
# List long option names
elif [[ $cur == --* ]]; then
subcmd=${COMP_WORDS[1]}
--
1.7.1
next prev parent reply other threads:[~2012-10-04 18:12 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-04 18:08 [GIT PULL 00/42] perf/core improvements and fixes Arnaldo Carvalho de Melo
2012-10-04 18:08 ` [PATCH 01/42] perf tools: Move libdw availability check before arch Makefile Arnaldo Carvalho de Melo
2012-10-04 18:08 ` [PATCH 02/42] perf tools: Remove unused PYRF_OBJS variable on Makefile Arnaldo Carvalho de Melo
2012-10-04 18:08 ` [PATCH 03/42] perf tools: Convert to LIBELF_SUPPORT Arnaldo Carvalho de Melo
2012-10-04 18:08 ` [PATCH 04/42] perf tools: Convert to LIBUNWIND_SUPPORT Arnaldo Carvalho de Melo
2012-10-04 18:08 ` [PATCH 05/42] perf tools: Convert to LIBAUDIT_SUPPORT Arnaldo Carvalho de Melo
2012-10-04 18:08 ` [PATCH 06/42] perf tools: Convert to NEWT_SUPPORT Arnaldo Carvalho de Melo
2012-10-04 18:08 ` [PATCH 07/42] perf tools: Convert to GTK2_SUPPORT Arnaldo Carvalho de Melo
2012-10-04 18:08 ` [PATCH 08/42] perf tools: Convert to HAVE_STRLCPY Arnaldo Carvalho de Melo
2012-10-04 18:08 ` [PATCH 09/42] perf trace: Use evsel->handler.func Arnaldo Carvalho de Melo
2012-10-04 18:08 ` [PATCH 10/42] perf inject: Remove unused 'input_name' static var Arnaldo Carvalho de Melo
2012-10-04 18:08 ` [PATCH 11/42] perf inject: Remove static variables Arnaldo Carvalho de Melo
2012-10-04 18:08 ` [PATCH 12/42] perf sched: Look up thread using tid instead of pid Arnaldo Carvalho de Melo
2012-10-04 18:08 ` [PATCH 13/42] perf stat: Don't use globals where not needed to Arnaldo Carvalho de Melo
2012-10-04 18:08 ` [PATCH 14/42] perf script: " Arnaldo Carvalho de Melo
2012-10-04 18:08 ` [PATCH 15/42] perf help: " Arnaldo Carvalho de Melo
2012-10-04 18:08 ` [PATCH 16/42] perf kmem: " Arnaldo Carvalho de Melo
2012-10-04 18:08 ` [PATCH 17/42] perf lock: " Arnaldo Carvalho de Melo
2012-10-04 18:08 ` [PATCH 18/42] perf timechart: " Arnaldo Carvalho de Melo
2012-10-04 18:08 ` [PATCH 19/42] perf buildid-cache: " Arnaldo Carvalho de Melo
2012-10-04 18:08 ` [PATCH 20/42] perf buildid-list: " Arnaldo Carvalho de Melo
2012-10-04 18:08 ` [PATCH 21/42] perf probe: " Arnaldo Carvalho de Melo
2012-10-04 18:08 ` [PATCH 22/42] perf top: " Arnaldo Carvalho de Melo
2012-10-04 18:08 ` [PATCH 23/42] perf evlist: " Arnaldo Carvalho de Melo
2012-10-04 18:08 ` [PATCH 24/42] perf record: " Arnaldo Carvalho de Melo
2012-10-04 18:08 ` [PATCH 25/42] perf inject: " Arnaldo Carvalho de Melo
2012-10-04 18:08 ` [PATCH 26/42] perf tools: Check existence of _get_comp_words_by_ref when bash completing Arnaldo Carvalho de Melo
2012-10-04 18:08 ` [PATCH 27/42] perf tools: Complete long option names of perf command Arnaldo Carvalho de Melo
2012-10-04 18:08 ` [PATCH 28/42] perf tools: Long option completion support for each subcommands Arnaldo Carvalho de Melo
2012-10-04 18:08 ` [PATCH 29/42] perf tools: Convert to BACKTRACE_SUPPORT Arnaldo Carvalho de Melo
2012-10-04 18:08 ` [PATCH 30/42] perf kvm: Move global variables into a perf_kvm struct Arnaldo Carvalho de Melo
2012-10-04 18:08 ` [PATCH 31/42] perf evlist: Introduce add_newtp method Arnaldo Carvalho de Melo
2012-10-04 18:08 ` [PATCH 32/42] perf evlist: Remove some unused methods Arnaldo Carvalho de Melo
2012-10-04 18:08 ` Arnaldo Carvalho de Melo [this message]
2012-10-05 12:39 ` [PATCH 33/42] perf tools: Complete tracepoint event names Frederic Weisbecker
2012-10-04 18:08 ` [PATCH 34/42] perf hists: Add struct hists pointer to struct hist_entry Arnaldo Carvalho de Melo
2012-10-04 18:08 ` [PATCH 35/42] perf diff: Refactor diff displacement possition info Arnaldo Carvalho de Melo
2012-10-04 18:08 ` [PATCH 36/42] perf hists: Separate overhead and baseline columns Arnaldo Carvalho de Melo
2012-10-04 18:08 ` [PATCH 37/42] perf tools: Removing hists pair argument from output path Arnaldo Carvalho de Melo
2012-10-04 18:08 ` [PATCH 38/42] perf tool: Add hpp interface to enable/disable hpp column Arnaldo Carvalho de Melo
2012-10-04 18:08 ` [PATCH 39/42] perf diff: Removing the total_period argument from output code Arnaldo Carvalho de Melo
2012-10-04 18:08 ` [PATCH 40/42] perf hists: Introduce struct he_stat Arnaldo Carvalho de Melo
2012-10-04 18:08 ` [PATCH 41/42] perf hists: Move he->stat.nr_events initialization to a template Arnaldo Carvalho de Melo
2012-10-04 18:08 ` [PATCH 42/42] perf hists: Add more helpers for hist entry stat Arnaldo Carvalho de Melo
2012-10-05 8:18 ` [GIT PULL 00/42] perf/core improvements and fixes Ingo Molnar
2012-10-05 8:35 ` [PATCH] tools lib traceevent: Do not generate dependency for system header files Namhyung Kim
2012-10-05 8:51 ` [GIT PULL 00/42] perf/core improvements and fixes Namhyung Kim
2012-10-05 10:22 ` Ingo Molnar
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=1349374122-27806-34-git-send-email-acme@infradead.org \
--to=acme@infradead.org \
--cc=a.p.zijlstra@chello.nl \
--cc=acme@redhat.com \
--cc=dsahern@gmail.com \
--cc=fweisbec@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=namhyung.kim@lge.com \
--cc=namhyung@kernel.org \
--cc=paulus@samba.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).