diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2015-05-12 11:13:41 +0300 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2015-05-12 11:13:41 +0300 |
| commit | 8becdc18c3e1f855cae5af266f6a1f5ce5af24fb (patch) | |
| tree | c42e2d4274b1aa17a7822385535ac8524e4a6822 /tools/perf/builtin-trace.c | |
| parent | 3c1b5c9bd991d1c023f736b0187582aae8a5b30a (diff) | |
| parent | 030bbdbf4c833bc69f502eae58498bc5572db736 (diff) | |
| download | linux-8becdc18c3e1f855cae5af266f6a1f5ce5af24fb.tar.xz | |
Merge tag 'v4.1-rc3' into devel
Linux 4.1-rc3
Diffstat (limited to 'tools/perf/builtin-trace.c')
| -rw-r--r-- | tools/perf/builtin-trace.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c index e124741be187..e122970361f2 100644 --- a/tools/perf/builtin-trace.c +++ b/tools/perf/builtin-trace.c @@ -2241,10 +2241,11 @@ static int trace__run(struct trace *trace, int argc, const char **argv) if (err < 0) goto out_error_mmap; + if (!target__none(&trace->opts.target)) + perf_evlist__enable(evlist); + if (forks) perf_evlist__start_workload(evlist); - else - perf_evlist__enable(evlist); trace->multiple_threads = evlist->threads->map[0] == -1 || evlist->threads->nr > 1 || @@ -2272,6 +2273,11 @@ next_event: if (interrupted) goto out_disable; + + if (done && !draining) { + perf_evlist__disable(evlist); + draining = true; + } } } |