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

Commit 69e7e5b0 authored by Adrian Hunter's avatar Adrian Hunter Committed by Arnaldo Carvalho de Melo
Browse files

perf record: Default -t option to no inheritance 



The change to per-cpu mmaps causes the -p, -t and -u options now to have
inheritance enabled by default.  Change that back to no inheritance but
for the -t option only.

Requested-by: default avatarPeter Zijlstra <peterz@infradead.org>
Signed-off-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Namhyung Kim <namhyung@gmail.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/r/1384768557-23331-5-git-send-email-adrian.hunter@intel.com


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

tools/perf/Documentation/perf-record.txt

+2 −0
Original line number Diff line number Diff line
@@ -57,6 +57,8 @@ OPTIONS 
-t::

--tid=::

        Record events on existing thread ID (comma separated list).

        This option also disables inheritance by default.  Enable it by adding

        --inherit.



-u::

--uid=::

tools/perf/builtin-record.c

+6 −2
Original line number Diff line number Diff line
@@ -843,7 +843,8 @@ const struct option record_options[] = { 
	OPT_U64('c', "count", &record.opts.user_interval, "event period to sample"),

	OPT_STRING('o', "output", &record.file.path, "file",

		    "output file name"),

	OPT_BOOLEAN('i', "no-inherit", &record.opts.no_inherit,

	OPT_BOOLEAN_SET('i', "no-inherit", &record.opts.no_inherit,

			&record.opts.no_inherit_set,

			"child tasks do not inherit counters"),

	OPT_UINTEGER('F', "freq", &record.opts.user_freq, "profile at this frequency"),

	OPT_CALLBACK('m', "mmap-pages", &record.opts.mmap_pages, "pages",
@@ -939,6 +940,9 @@ int cmd_record(int argc, const char **argv, const char *prefix __maybe_unused) 
		goto out_symbol_exit;

	}



	if (rec->opts.target.tid && !rec->opts.no_inherit_set)

		rec->opts.no_inherit = true;



	err = target__validate(&rec->opts.target);

	if (err) {

		target__strerror(&rec->opts.target, err, errbuf, BUFSIZ);

tools/perf/perf.h

+1 −0
Original line number Diff line number Diff line
@@ -254,6 +254,7 @@ struct perf_record_opts { 
	bool	     inherit_stat;

	bool	     no_delay;

	bool	     no_inherit;

	bool	     no_inherit_set;

	bool	     no_samples;

	bool	     raw_samples;

	bool	     sample_address;