From: Jiri Olsa <jolsa@kernel.org>
To: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: lkml <linux-kernel@vger.kernel.org>,
Ingo Molnar <mingo@kernel.org>,
Namhyung Kim <namhyung@kernel.org>,
Alexander Shishkin <alexander.shishkin@linux.intel.com>,
Peter Zijlstra <a.p.zijlstra@chello.nl>,
Andi Kleen <ak@linux.intel.com>
Subject: [PATCH 3/6] perf script: Allow +- operator for type specific fields option
Date: Wed, 20 Feb 2019 13:27:57 +0100 [thread overview]
Message-ID: <20190220122800.864-4-jolsa@kernel.org> (raw)
In-Reply-To: <20190220122800.864-1-jolsa@kernel.org>
Adding support to add/remove fields for specific event types
in -F option. It's now possible to use '+-' after event type,
like:
# cat > test.c
#include <stdio.h>
int main(void)
{
printf("Hello world\n");
while(1) {}
}
^D
# gcc -g -o test test.c
# perf probe -x test 'test.c:5'
# perf record -e '{cpu/cpu-cycles,period=10000/,probe_test:main}:S' ./test
...
# perf script -Ftrace:+period,-cpu
test 3859 396291.117343: 10275 cpu/cpu-cycles,period=10000/: 7f..
test 3859 396291.118234: 11041 cpu/cpu-cycles,period=10000/: ffffff..
test 3859 396291.118234: 1 probe_test:main:
test 3859 396291.118248: 8668 cpu/cpu-cycles,period=10000/: ffffff..
test 3859 396291.118263: 10139 cpu/cpu-cycles,period=10000/: ffffff..
Link: http://lkml.kernel.org/n/tip-gpd58vbcgsk4zx041zwl85e8@git.kernel.org
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
---
tools/perf/Documentation/perf-script.txt | 6 ++++++
tools/perf/builtin-script.c | 8 ++++++++
2 files changed, 14 insertions(+)
diff --git a/tools/perf/Documentation/perf-script.txt b/tools/perf/Documentation/perf-script.txt
index 9e4def08d569..2e19fd7ffe35 100644
--- a/tools/perf/Documentation/perf-script.txt
+++ b/tools/perf/Documentation/perf-script.txt
@@ -159,6 +159,12 @@ OPTIONS
the override, and the result of the above is that only S/W and H/W
events are displayed with the given fields.
+ It's possible tp add/remove fields only for specific event type:
+
+ -Fsw:-cpu,-period
+
+ removes cpu and period from software events.
+
For the 'wildcard' option if a user selected field is invalid for an
event type, a message is displayed to the user that the option is
ignored for that type. For example:
diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c
index 8d5fe092525c..373ea151dc60 100644
--- a/tools/perf/builtin-script.c
+++ b/tools/perf/builtin-script.c
@@ -2560,6 +2560,10 @@ static int parse_output_fields(const struct option *opt __maybe_unused,
pr_warning("Overriding previous field request for %s events.\n",
event_type(type));
+ /* Don't override defaults for +- */
+ if (strchr(tok, '+') || strchr(tok, '-'))
+ goto parse;
+
output[type].fields = 0;
output[type].user_set = true;
output[type].wildcard_set = false;
@@ -2644,6 +2648,10 @@ static int parse_output_fields(const struct option *opt __maybe_unused,
rc = -EINVAL;
goto out;
}
+ if (change == REMOVE)
+ output[type].fields &= ~all_output_options[i].field;
+ else
+ output[type].fields |= all_output_options[i].field;
output[type].user_set = true;
output[type].wildcard_set = true;
}
--
2.17.2
next prev parent reply other threads:[~2019-02-20 12:28 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-20 12:27 [PATCH 0/6] perf tools: Assorted fixes Jiri Olsa
2019-02-20 12:27 ` [PATCH 1/6] perf tools: Don't report zero period samples for slave events Jiri Olsa
2019-02-28 7:44 ` [tip:perf/core] perf session: " tip-bot for Jiri Olsa
2019-02-20 12:27 ` [PATCH 2/6] perf tools: Force sample_type " Jiri Olsa
2019-02-28 7:45 ` [tip:perf/core] perf evsel: " tip-bot for Jiri Olsa
2019-02-20 12:27 ` Jiri Olsa [this message]
2019-02-28 7:45 ` [tip:perf/core] perf script: Allow +- operator for type specific fields option tip-bot for Jiri Olsa
2019-02-20 12:27 ` [PATCH 4/6] perf tools: Add missing new line into pr_debug call Jiri Olsa
2019-02-20 19:23 ` Arnaldo Carvalho de Melo
2019-02-28 7:46 ` [tip:perf/core] perf bpf-event: " tip-bot for Jiri Olsa
2019-02-20 12:27 ` [PATCH 5/6] perf tools: Increase debug leve for cpu_map__snprint verbose output Jiri Olsa
2019-02-28 7:47 ` [tip:perf/core] perf cpumap: Increase debug level " tip-bot for Jiri Olsa
2019-02-20 12:28 ` [PATCH 6/6] perf tools: Make rm_rf to remove single file Jiri Olsa
2019-02-28 7:47 ` [tip:perf/core] perf tools: Make rm_rf() " tip-bot for Jiri Olsa
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=20190220122800.864-4-jolsa@kernel.org \
--to=jolsa@kernel.org \
--cc=a.p.zijlstra@chello.nl \
--cc=acme@kernel.org \
--cc=ak@linux.intel.com \
--cc=alexander.shishkin@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=namhyung@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 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).