From: Arnaldo Carvalho de Melo <acme@infradead.org>
To: Ingo Molnar <mingo@kernel.org>
Cc: linux-kernel@vger.kernel.org, Namhyung Kim <namhyung@kernel.org>,
David Ahern <dsahern@gmail.com>,
Frederic Weisbecker <fweisbec@gmail.com>,
Peter Zijlstra <peterz@infradead.org>,
Arnaldo Carvalho de Melo <acme@redhat.com>
Subject: [PATCH 28/42] perf tools: Long option completion support for each subcommands
Date: Thu, 4 Oct 2012 15:08:28 -0300 [thread overview]
Message-ID: <1349374122-27806-29-git-send-email-acme@infradead.org> (raw)
In-Reply-To: <1349374122-27806-1-git-send-email-acme@infradead.org>
From: Namhyung Kim <namhyung@kernel.org>
Add internal --list-opts option to print all of long option names to
stdout so that it can be used for bash completion engine.
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Acked-by: Frederic Weisbecker <fweisbec@gmail.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/1349191294-6926-4-git-send-email-namhyung@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/bash_completion | 9 +++++++--
tools/perf/util/parse-options.c | 8 ++++++++
tools/perf/util/parse-options.h | 1 +
3 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/tools/perf/bash_completion b/tools/perf/bash_completion
index bef06f0..5c355ab 100644
--- a/tools/perf/bash_completion
+++ b/tools/perf/bash_completion
@@ -33,8 +33,13 @@ _perf()
fi
# List possible events for -e option
elif [[ $prev == "-e" && "${COMP_WORDS[1]}" == @(record|stat|top) ]]; then
- cmds=$($cmd list --raw-dump)
- COMPREPLY=( $( compgen -W '$cmds' -- "$cur" ) )
+ evts=$($cmd list --raw-dump)
+ COMPREPLY=( $( compgen -W '$evts' -- "$cur" ) )
+ # List long option names
+ elif [[ $cur == --* ]]; then
+ subcmd=${COMP_WORDS[1]}
+ opts=$($cmd $subcmd --list-opts)
+ COMPREPLY=( $( compgen -W '$opts' -- "$cur" ) )
# Fall down to list regular files
else
_filedir
diff --git a/tools/perf/util/parse-options.c b/tools/perf/util/parse-options.c
index 443fc11..2bc9e70 100644
--- a/tools/perf/util/parse-options.c
+++ b/tools/perf/util/parse-options.c
@@ -384,6 +384,8 @@ int parse_options_step(struct parse_opt_ctx_t *ctx,
return usage_with_options_internal(usagestr, options, 1);
if (internal_help && !strcmp(arg + 2, "help"))
return parse_options_usage(usagestr, options);
+ if (!strcmp(arg + 2, "list-opts"))
+ return PARSE_OPT_LIST;
switch (parse_long_opt(ctx, arg + 2, options)) {
case -1:
return parse_options_usage(usagestr, options);
@@ -422,6 +424,12 @@ int parse_options(int argc, const char **argv, const struct option *options,
exit(129);
case PARSE_OPT_DONE:
break;
+ case PARSE_OPT_LIST:
+ while (options->type != OPTION_END) {
+ printf("--%s ", options->long_name);
+ options++;
+ }
+ exit(130);
default: /* PARSE_OPT_UNKNOWN */
if (ctx.argv[0][1] == '-') {
error("unknown option `%s'", ctx.argv[0] + 2);
diff --git a/tools/perf/util/parse-options.h b/tools/perf/util/parse-options.h
index abc31a1..7bb5999 100644
--- a/tools/perf/util/parse-options.h
+++ b/tools/perf/util/parse-options.h
@@ -140,6 +140,7 @@ extern NORETURN void usage_with_options(const char * const *usagestr,
enum {
PARSE_OPT_HELP = -1,
PARSE_OPT_DONE,
+ PARSE_OPT_LIST,
PARSE_OPT_UNKNOWN,
};
--
1.7.1
next prev parent reply other threads:[~2012-10-04 18:09 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 ` Arnaldo Carvalho de Melo [this message]
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 ` [PATCH 33/42] perf tools: Complete tracepoint event names Arnaldo Carvalho de Melo
2012-10-05 12:39 ` 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-29-git-send-email-acme@infradead.org \
--to=acme@infradead.org \
--cc=acme@redhat.com \
--cc=dsahern@gmail.com \
--cc=fweisbec@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=namhyung@kernel.org \
--cc=peterz@infradead.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).