Commit 5698f26b authored by Jiri Olsa's avatar Jiri Olsa Committed by Arnaldo Carvalho de Melo
Browse files

perf stat: Move 'no_inherit' to 'struct perf_stat_config' 



Move the static 'no_inherit' variable to 'struct perf_stat_config', so
it can be passed around and used outside the 'perf stat' command.

Signed-off-by: default avatarJiri Olsa <jolsa@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Andi Kleen <andi@firstfloor.org>
Cc: David Ahern <dsahern@gmail.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20180830063252.23729-4-jolsa@kernel.org


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

tools/perf/builtin-stat.c

+2 −3
Original line number Diff line number Diff line
@@ -148,7 +148,6 @@ typedef int (*aggr_get_id_t)(struct cpu_map *m, int cpu); 
#define METRIC_ONLY_LEN 20



static int			run_count			=  1;

static bool			no_inherit			= false;

static volatile pid_t		child_pid			= -1;

static bool			null_run			=  false;

static int			detailed_run			=  0;
@@ -254,7 +253,7 @@ static int create_perf_stat_counter(struct perf_evsel *evsel, 
	if (leader->nr_members > 1)

		attr->read_format |= PERF_FORMAT_ID|PERF_FORMAT_GROUP;



	attr->inherit = !no_inherit;

	attr->inherit = !config->no_inherit;



	/*

	 * Some events get initialized with sample_(period/type) set,
@@ -1969,7 +1968,7 @@ static const struct option stat_options[] = { 
		     parse_events_option),

	OPT_CALLBACK(0, "filter", &evsel_list, "filter",

		     "event filter", parse_filter),

	OPT_BOOLEAN('i', "no-inherit", &no_inherit,

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

		    "child tasks do not inherit counters"),

	OPT_STRING('p', "pid", &target.pid, "pid",

		   "stat events on existing process id"),

tools/perf/util/stat.h

+1 −0
Original line number Diff line number Diff line
@@ -88,6 +88,7 @@ struct runtime_stat { 
struct perf_stat_config {

	enum aggr_mode		 aggr_mode;

	bool			 scale;

	bool			 no_inherit;

	FILE			*output;

	unsigned int		 interval;

	unsigned int		 timeout;

CRA Git | Maintained and supported by SUSTech CRA and CCSE