Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f078c385 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

perf trace: Introduce --filter-pids 

When tracing in X we get event loops due to the tracing activity, i.e.
updates to a gnome-terminal that generate syscalls for X.org, etc.

To get a more useful view of what is happening, syscall wise, system
wide, we need to filter those, like in:

 # ps ax|egrep '981|2296|1519' | grep -v egrep
   981 tty1 Ss+ 5:40 /usr/bin/Xorg :0 -background none ...
  1519 ?    Sl  2:22 /usr/bin/gnome-shell
  2296 ?    Sl  4:16 /usr/libexec/gnome-terminal-server
 #

 # trace -e write --filter-pids 981,2296,1519
    0.385 ( 0.021 ms): goa-daemon/2061 write(fd: 1</dev/null>, buf: 0x7fbeb017b000, count: 136) = 136
    0.922 ( 0.014 ms): goa-daemon/2061 write(fd: 1</dev/null>, buf: 0x7fbeb017b000, count: 140) = 140
 5006.525 ( 0.029 ms): goa-daemon/2061 write(fd: 1</dev/null>, buf: 0x7fbeb017b000, count: 136) = 136
 5007.235 ( 0.023 ms): goa-daemon/2061 write(fd: 1</dev/null>, buf: 0x7fbeb017b000, count: 140) = 140
 5177.646 ( 0.018 ms): rtkit-daemon/782 write(fd: 5<anon_inode:[eventfd]>, buf: 0x7f7eea70be88, count: 8) = 8
 8314.497 ( 0.004 ms): gsd-locate-poi/2084 write(fd: 5<anon_inode:[eventfd]>, buf: 0x7fffe96af7b0, count: 8) = 8
 8314.518 ( 0.002 ms): gsd-locate-poi/2084 write(fd: 5<anon_inode:[eventfd]>, buf: 0x7fffe96af0e0, count: 8) = 8
 ^C#

When this option is used the tracer pid is also filtered.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Borislav Petkov <bp@suse.de>
Cc: David Ahern <dsahern@gmail.com>
Cc: Don Zickus <dzickus@redhat.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/n/tip-f5qmiyy7c0uxdm21ncatpeek@git.kernel.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent be199ada

tools/perf/Documentation/perf-trace.txt

+3 −0
Original line number Original line Diff line number Diff line
@@ -55,6 +55,9 @@ OPTIONS 
--uid=::

--uid=::

        Record events in threads owned by uid. Name or number.

        Record events in threads owned by uid. Name or number.





--filter-pids=::

	Filter out events for these pids and for 'trace' itself (comma separated list).



-v::

-v::

--verbose=::

--verbose=::

        Verbosity level.

        Verbosity level.

tools/perf/builtin-trace.c

+47 −2
Original line number Original line Diff line number Diff line
@@ -1229,6 +1229,10 @@ struct trace { 
	const char 		*last_vfs_getname;

	const char 		*last_vfs_getname;

	struct intlist		*tid_list;

	struct intlist		*tid_list;

	struct intlist		*pid_list;

	struct intlist		*pid_list;

	struct {

		size_t		nr;

		pid_t		*entries;

	}			filter_pids;

	double			duration_filter;

	double			duration_filter;

	double			runtime_ms;

	double			runtime_ms;

	struct {

	struct {
@@ -2157,8 +2161,15 @@ static int trace__run(struct trace *trace, int argc, const char **argv) 
	 * workload was, and in that case we will fill in the thread_map when

	 * workload was, and in that case we will fill in the thread_map when

	 * we fork the workload in perf_evlist__prepare_workload.

	 * we fork the workload in perf_evlist__prepare_workload.

	 */

	 */

	if (evlist->threads->map[0] == -1)

	if (trace->filter_pids.nr > 0)

		perf_evlist__set_filter_pid(evlist, getpid());

		err = perf_evlist__set_filter_pids(evlist, trace->filter_pids.nr, trace->filter_pids.entries);

	else if (evlist->threads->map[0] == -1)

		err = perf_evlist__set_filter_pid(evlist, getpid());



	if (err < 0) {

		printf("err=%d,%s\n", -err, strerror(-err));

		exit(1);

	}





	err = perf_evlist__mmap(evlist, trace->opts.mmap_pages, false);

	err = perf_evlist__mmap(evlist, trace->opts.mmap_pages, false);

	if (err < 0)

	if (err < 0)
@@ -2491,6 +2502,38 @@ static int trace__set_duration(const struct option *opt, const char *str, 
	return 0;

	return 0;

}

}





static int trace__set_filter_pids(const struct option *opt, const char *str,

				  int unset __maybe_unused)

{

	int ret = -1;

	size_t i;

	struct trace *trace = opt->value;

	/*

	 * FIXME: introduce a intarray class, plain parse csv and create a

	 * { int nr, int entries[] } struct...

	 */

	struct intlist *list = intlist__new(str);



	if (list == NULL)

		return -1;



	i = trace->filter_pids.nr = intlist__nr_entries(list) + 1;

	trace->filter_pids.entries = calloc(i, sizeof(pid_t));



	if (trace->filter_pids.entries == NULL)

		goto out;



	trace->filter_pids.entries[0] = getpid();



	for (i = 1; i < trace->filter_pids.nr; ++i)

		trace->filter_pids.entries[i] = intlist__entry(list, i - 1)->i;



	intlist__delete(list);

	ret = 0;

out:

	return ret;

}



static int trace__open_output(struct trace *trace, const char *filename)

static int trace__open_output(struct trace *trace, const char *filename)

{

{

	struct stat st;

	struct stat st;
@@ -2581,6 +2624,8 @@ int cmd_trace(int argc, const char **argv, const char *prefix __maybe_unused) 
		    "trace events on existing process id"),

		    "trace events on existing process id"),

	OPT_STRING('t', "tid", &trace.opts.target.tid, "tid",

	OPT_STRING('t', "tid", &trace.opts.target.tid, "tid",

		    "trace events on existing thread id"),

		    "trace events on existing thread id"),

	OPT_CALLBACK(0, "filter-pids", &trace, "float",

		     "show only events with duration > N.M ms", trace__set_filter_pids),

	OPT_BOOLEAN('a', "all-cpus", &trace.opts.target.system_wide,

	OPT_BOOLEAN('a', "all-cpus", &trace.opts.target.system_wide,

		    "system-wide collection from all CPUs"),

		    "system-wide collection from all CPUs"),

	OPT_STRING('C', "cpu", &trace.opts.target.cpu_list, "cpu",

	OPT_STRING('C', "cpu", &trace.opts.target.cpu_list, "cpu",