summaryrefslogtreecommitdiffstats
path: root/tools/perf/builtin-stat.c
diff options
context:
space:
mode:
authorJiri Olsa <jolsa@kernel.org>2015-12-03 10:06:45 +0100
committerArnaldo Carvalho de Melo <acme@redhat.com>2015-12-07 18:12:59 -0300
commitc8280cec2a196f2ffea83dd755b17eb020ca1b83 (patch)
tree7794fed446eb112f7f9c78cb0f7a4d41f5589a29 /tools/perf/builtin-stat.c
parent67ccdecd09cac818146b1e153ff901cb67570012 (diff)
downloadop-kernel-dev-c8280cec2a196f2ffea83dd755b17eb020ca1b83.zip
op-kernel-dev-c8280cec2a196f2ffea83dd755b17eb020ca1b83.tar.gz
perf stat: Move enable_on_exec setup under earlier code
It's more readable this way and we can save one perf_evsel__is_group_leader condition in current code. Signed-off-by: Jiri Olsa <jolsa@kernel.org> Cc: Adrian Hunter <adrian.hunter@intel.com> Cc: David Ahern <dsahern@gmail.com> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Link: http://lkml.kernel.org/r/1449133606-14429-7-git-send-email-jolsa@kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf/builtin-stat.c')
-rw-r--r--tools/perf/builtin-stat.c15
1 files changed, 9 insertions, 6 deletions
diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c
index 2e70610..e74712d 100644
--- a/tools/perf/builtin-stat.c
+++ b/tools/perf/builtin-stat.c
@@ -173,17 +173,20 @@ static int create_perf_stat_counter(struct perf_evsel *evsel)
* either manually by us or by kernel via enable_on_exec
* set later.
*/
- if (perf_evsel__is_group_leader(evsel))
+ if (perf_evsel__is_group_leader(evsel)) {
attr->disabled = 1;
- if (target__has_cpu(&target))
- return perf_evsel__open_per_cpu(evsel, perf_evsel__cpus(evsel));
-
- if (!target__has_task(&target) && perf_evsel__is_group_leader(evsel)) {
- if (!initial_delay)
+ /*
+ * In case of initial_delay we enable tracee
+ * events manually.
+ */
+ if (target__none(&target) && !initial_delay)
attr->enable_on_exec = 1;
}
+ if (target__has_cpu(&target))
+ return perf_evsel__open_per_cpu(evsel, perf_evsel__cpus(evsel));
+
return perf_evsel__open_per_thread(evsel, evsel_list->threads);
}
OpenPOWER on IntegriCloud