From: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
To: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
David Ahern <dsahern@gmail.com>,
namhyung@kernel.org, Jiri Olsa <jolsa@redhat.com>,
Ingo Molnar <mingo@kernel.org>
Subject: [PATCH perf/core 1/8] [BUGFIX] perf probe: Make --funcs option exclusive
Date: Tue, 21 Apr 2015 20:41:58 +0900 [thread overview]
Message-ID: <20150421114158.21617.58375.stgit@localhost.localdomain> (raw)
In-Reply-To: <20150421114155.21617.91519.stgit@localhost.localdomain>
--funcs option is a command which should be given exclusively.
This adds PARSE_OPT_EXCUSIVE flag on --funcs (-F) option.
Without this, 'perf probe --funcs -l' just shows the list of
probes. With this, it shows error message correctly.
This also fixes the help message and the documentation.
Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
---
tools/perf/Documentation/perf-probe.txt | 2 ++
tools/perf/builtin-probe.c | 2 ++
2 files changed, 4 insertions(+)
diff --git a/tools/perf/Documentation/perf-probe.txt b/tools/perf/Documentation/perf-probe.txt
index 239609c..a4a3cc7 100644
--- a/tools/perf/Documentation/perf-probe.txt
+++ b/tools/perf/Documentation/perf-probe.txt
@@ -19,6 +19,8 @@ or
'perf probe' [options] --line='LINE'
or
'perf probe' [options] --vars='PROBEPOINT'
+or
+'perf probe' [options] --funcs
DESCRIPTION
-----------
diff --git a/tools/perf/builtin-probe.c b/tools/perf/builtin-probe.c
index f7b1af6..92dcce0 100644
--- a/tools/perf/builtin-probe.c
+++ b/tools/perf/builtin-probe.c
@@ -321,6 +321,7 @@ __cmd_probe(int argc, const char **argv, const char *prefix __maybe_unused)
"perf probe [<options>] --line 'LINEDESC'",
"perf probe [<options>] --vars 'PROBEPOINT'",
#endif
+ "perf probe [<options>] --funcs",
NULL
};
struct option options[] = {
@@ -402,6 +403,7 @@ __cmd_probe(int argc, const char **argv, const char *prefix __maybe_unused)
set_option_flag(options, 'L', "line", PARSE_OPT_EXCLUSIVE);
set_option_flag(options, 'V', "vars", PARSE_OPT_EXCLUSIVE);
#endif
+ set_option_flag(options, 'F', "funcs", PARSE_OPT_EXCLUSIVE);
argc = parse_options(argc, argv, options, probe_usage,
PARSE_OPT_STOP_AT_NON_OPTION);
next prev parent reply other threads:[~2015-04-21 11:46 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-21 11:41 [PATCH perf/core 0/8] perf-probe: Add filtering features Masami Hiramatsu
2015-04-21 11:41 ` Masami Hiramatsu [this message]
2015-04-21 11:42 ` [PATCH perf/core 2/8] [BUGFIX] perf probe: Remove all probes matches given pattern at once Masami Hiramatsu
2015-04-22 7:33 ` Namhyung Kim
2015-04-22 12:27 ` Masami Hiramatsu
2015-04-21 11:42 ` [PATCH perf/core 3/8] perf probe: Accept multiple filter options Masami Hiramatsu
2015-04-21 11:42 ` [PATCH perf/core 4/8] perf probe: Accept filter argument for --list Masami Hiramatsu
2015-04-21 11:42 ` [PATCH perf/core 5/8] perf probe: Allow to use filter on --del command Masami Hiramatsu
2015-04-22 13:56 ` Namhyung Kim
2015-04-23 13:10 ` Masami Hiramatsu
2015-04-21 11:42 ` [PATCH perf/core 6/8] perf probe: Accept filter argument for --funcs Masami Hiramatsu
2015-04-21 11:42 ` [PATCH perf/core 7/8] perf probe: Remove redundant cleanup of params.filter Masami Hiramatsu
2015-04-21 11:42 ` [PATCH perf/core 8/8] perf probe: Cleanup and consolidate command parsers Masami Hiramatsu
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=20150421114158.21617.58375.stgit@localhost.localdomain \
--to=masami.hiramatsu.pt@hitachi.com \
--cc=acme@kernel.org \
--cc=dsahern@gmail.com \
--cc=jolsa@redhat.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).