linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Arnaldo Carvalho de Melo <acme@infradead.org>
To: Ingo Molnar <mingo@kernel.org>
Cc: linux-kernel@vger.kernel.org,
	Arnaldo Carvalho de Melo <acme@redhat.com>,
	Adrian Hunter <adrian.hunter@intel.com>,
	David Ahern <dsahern@gmail.com>,
	Frederic Weisbecker <fweisbec@gmail.com>,
	Mike Galbraith <efault@gmx.de>, Paul Mackerras <paulus@samba.org>,
	Peter Zijlstra <peterz@infradead.org>,
	Stephane Eranian <eranian@google.com>
Subject: [PATCH 09/21] perf trace: Support ! in -e expressions
Date: Wed, 28 Aug 2013 11:59:25 -0300	[thread overview]
Message-ID: <1377701977-2085-10-git-send-email-acme@infradead.org> (raw)
In-Reply-To: <1377701977-2085-1-git-send-email-acme@infradead.org>

From: Arnaldo Carvalho de Melo <acme@redhat.com>

So that we can ask for all but a set of syscalls to be traced.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/n/tip-9j6hvap23qanyl96wx4mrj9k@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/Documentation/perf-trace.txt |  2 ++
 tools/perf/builtin-trace.c              | 28 +++++++++++++++++++---------
 2 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/tools/perf/Documentation/perf-trace.txt b/tools/perf/Documentation/perf-trace.txt
index cb3371e..4754f11 100644
--- a/tools/perf/Documentation/perf-trace.txt
+++ b/tools/perf/Documentation/perf-trace.txt
@@ -30,6 +30,8 @@ OPTIONS
 -e::
 --expr::
 	List of events to show, currently only syscall names.
+	Prefixing with ! shows all syscalls but the ones specified.  You may
+	need to escape it.
 
 -o::
 --output=::
diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c
index 9891d8c..6ab7a7a 100644
--- a/tools/perf/builtin-trace.c
+++ b/tools/perf/builtin-trace.c
@@ -114,8 +114,9 @@ struct trace {
 	struct machine		host;
 	u64			base_time;
 	FILE			*output;
-	struct strlist		*ev_qualifier;
 	unsigned long		nr_events;
+	struct strlist		*ev_qualifier;
+	bool			not_ev_qualifier;
 	bool			sched;
 	bool			multiple_threads;
 	double			duration_filter;
@@ -234,13 +235,17 @@ static int trace__read_syscall_info(struct trace *trace, int id)
 	sc = trace->syscalls.table + id;
 	sc->name = name;
 
-	if (trace->ev_qualifier && !strlist__find(trace->ev_qualifier, name)) {
-		sc->filtered = true;
-		/*
- 		 * No need to do read tracepoint information since this will be
- 		 * filtered out.
- 		 */
-		return 0;
+	if (trace->ev_qualifier) {
+		bool in = strlist__find(trace->ev_qualifier, name) != NULL;
+
+		if (!(in ^ trace->not_ev_qualifier)) {
+			sc->filtered = true;
+			/*
+			 * No need to do read tracepoint information since this will be
+			 * filtered out.
+			 */
+			return 0;
+		}
 	}
 
 	sc->fmt  = syscall_fmt__find(sc->name);
@@ -725,7 +730,12 @@ int cmd_trace(int argc, const char **argv, const char *prefix __maybe_unused)
 	}
 
 	if (ev_qualifier_str != NULL) {
-		trace.ev_qualifier = strlist__new(true, ev_qualifier_str);
+		const char *s = ev_qualifier_str;
+
+		trace.not_ev_qualifier = *s == '!';
+		if (trace.not_ev_qualifier)
+			++s;
+		trace.ev_qualifier = strlist__new(true, s);
 		if (trace.ev_qualifier == NULL) {
 			fputs("Not enough memory to parse event qualifier",
 			      trace.output);
-- 
1.8.1.4


  parent reply	other threads:[~2013-08-28 15:03 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-08-28 14:59 [GIT PULL 00/21] perf/core improvements and fixes Arnaldo Carvalho de Melo
2013-08-28 14:59 ` [PATCH 01/21] perf kvm: Remove force option to cmd_record Arnaldo Carvalho de Melo
2013-08-28 14:59 ` [PATCH 02/21] perf tools: Try to increase the file descriptor limits on EMFILE Arnaldo Carvalho de Melo
2013-08-28 14:59 ` [PATCH 03/21] perf tools: Re-implement debug print function for linking python/perf.so Arnaldo Carvalho de Melo
2013-08-28 14:59 ` [PATCH 04/21] perf tools: Add debug prints Arnaldo Carvalho de Melo
2013-08-28 14:59 ` [PATCH 05/21] perf trace: Implement -o/--output filename Arnaldo Carvalho de Melo
2013-08-28 14:59 ` [PATCH 06/21] perf trace: Make command line arguments consistent with perf-record Arnaldo Carvalho de Melo
2013-08-28 14:59 ` [PATCH 07/21] perf tools: Sample after exit loses thread correlation Arnaldo Carvalho de Melo
2013-08-28 14:59 ` [PATCH 08/21] perf tools: Don't install scripting files files when disabled Arnaldo Carvalho de Melo
2013-08-28 14:59 ` Arnaldo Carvalho de Melo [this message]
2013-08-28 14:59 ` [PATCH 10/21] perf trace: Add --verbose option Arnaldo Carvalho de Melo
2013-08-28 14:59 ` [PATCH 11/21] perf trace: Hide sys_exit messages about syscall id = -1 Arnaldo Carvalho de Melo
2013-08-28 14:59 ` [PATCH 12/21] perf trace: Introduce syscall arg formatters Arnaldo Carvalho de Melo
2013-08-28 14:59 ` [PATCH 13/21] perf trace: Simplify sys_exit return printing Arnaldo Carvalho de Melo
2013-08-28 14:59 ` [PATCH 14/21] perf trace: Allow printing syscall return values in hex Arnaldo Carvalho de Melo
2013-08-28 14:59 ` [PATCH 15/21] perf trace: Add aliases to remaining syscalls of the sys_enter_newfoo Arnaldo Carvalho de Melo
2013-08-28 14:59 ` [PATCH 16/21] perf trace: Allow overiding the formatting of syscall fields Arnaldo Carvalho de Melo
2013-08-28 14:59 ` [PATCH 17/21] perf trace: Add beautifier for mmap prot parm Arnaldo Carvalho de Melo
2013-08-28 14:59 ` [PATCH 18/21] perf trace: Add beautifier for mmap flags parm Arnaldo Carvalho de Melo
2013-08-28 14:59 ` [PATCH 19/21] perf trace: Add beautifier for madvise behaviour/advice parm Arnaldo Carvalho de Melo
2013-08-28 14:59 ` [PATCH 20/21] perf tools: Add pid to struct thread Arnaldo Carvalho de Melo
2013-08-28 14:59 ` [PATCH 21/21] tools lib traceevent: Fixup jobserver setup Arnaldo Carvalho de Melo
2013-08-29 10:04 ` [GIT PULL 00/21] perf/core improvements and fixes 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=1377701977-2085-10-git-send-email-acme@infradead.org \
    --to=acme@infradead.org \
    --cc=acme@redhat.com \
    --cc=adrian.hunter@intel.com \
    --cc=dsahern@gmail.com \
    --cc=efault@gmx.de \
    --cc=eranian@google.com \
    --cc=fweisbec@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@kernel.org \
    --cc=paulus@samba.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).