Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-09-21 07:23:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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: Jiri 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: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Jiri Olsa 2018-08-30 08:32:12 +02:00 committed by Arnaldo Carvalho de Melo
parent 728c0ee0a8
commit 5698f26b46
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tools/perf/builtin-stat.c
View File

@ -148,7 +148,6 @@ typedef int (*aggr_get_id_t)(struct cpu_map *m, int cpu);
#define METRIC_ONLY_LEN 20 #define METRIC_ONLY_LEN 20
static int run_count = 1; static int run_count = 1;
static bool no_inherit = false;
static volatile pid_t child_pid = -1; static volatile pid_t child_pid = -1;
static bool null_run = false; static bool null_run = false;
static int detailed_run = 0; static int detailed_run = 0;
@ -254,7 +253,7 @@ static int create_perf_stat_counter(struct perf_evsel *evsel,
if (leader->nr_members > 1) if (leader->nr_members > 1)
attr->read_format |= PERF_FORMAT_ID|PERF_FORMAT_GROUP; 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, * Some events get initialized with sample_(period/type) set,
@ -1969,7 +1968,7 @@ static const struct option stat_options[] = {
parse_events_option), parse_events_option),
OPT_CALLBACK(0, "filter", &evsel_list, "filter", OPT_CALLBACK(0, "filter", &evsel_list, "filter",
"event filter", parse_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"), "child tasks do not inherit counters"),
OPT_STRING('p', "pid", &target.pid, "pid", OPT_STRING('p', "pid", &target.pid, "pid",
"stat events on existing process id"), "stat events on existing process id"),

1
tools/perf/util/stat.h
View File

@ -88,6 +88,7 @@ struct runtime_stat {
struct perf_stat_config { struct perf_stat_config {
enum aggr_mode aggr_mode; enum aggr_mode aggr_mode;
bool scale; bool scale;
bool no_inherit;
FILE *output; FILE *output;
unsigned int interval; unsigned int interval;
unsigned int timeout; unsigned int timeout;