summaryrefslogtreecommitdiff
path: root/tools/perf/builtin-trace.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2015-05-11 11:56:27 +0200
committerIngo Molnar <mingo@kernel.org>2015-05-11 11:56:27 +0200
commitf7dc7fd1c08c6d8109688694fd93d80645df89ff (patch)
tree255e1e24bcf089d584e45ea8a733883c1bb4d74c /tools/perf/builtin-trace.c
parent32b0ed3ae66cd6114f8510161f833f05518c0395 (diff)
parent44b11fee51711ca85aa2b121a49bf029d18a3722 (diff)
downloadlinux-f7dc7fd1c08c6d8109688694fd93d80645df89ff.tar.gz
Merge branch 'perf/urgent' into perf/core, to resolve conflicts
Conflicts: tools/perf/builtin-kmem.c Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/builtin-trace.c')
-rw-r--r--tools/perf/builtin-trace.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c
index bb05e44f8f0c..cbfdb9523868 100644
--- a/tools/perf/builtin-trace.c
+++ b/tools/perf/builtin-trace.c
@@ -2251,10 +2251,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 ||
@@ -2282,6 +2283,11 @@ next_event:
if (interrupted)
goto out_disable;
+
+ if (done && !draining) {
+ perf_evlist__disable(evlist);
+ draining = true;
+ }
}
}