aboutsummaryrefslogtreecommitdiff
path: root/tools/perf
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo <acme@redhat.com>2010-05-02 13:37:24 -0300
committerArnaldo Carvalho de Melo <acme@redhat.com>2010-05-02 13:37:24 -0300
commit2c9faa060064343a4a0b16f5b77f3c61d1d17e23 (patch)
treea777f00991bca2a82fc2dcff3f7335890fd0abc2 /tools/perf
parent454c407ec17a0c63e4023ac0877d687945a7df4a (diff)
downloadlinux-2.6.34-ux500-2c9faa060064343a4a0b16f5b77f3c61d1d17e23.tar.gz
perf record: Don't exit in live mode when no tracepoints are enabled
With this I was able to actually test Tom Zanussi's two previous patches in my usual perf testing ways, i.e. without any tracepoints activated. Cc: Frédéric Weisbecker <fweisbec@gmail.com> Cc: Mike Galbraith <efault@gmx.de> Cc: Paul Mackerras <paulus@samba.org> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Cc: Tom Zanussi <tzanussi@gmail.com> LKML-Reference: <new-submission> Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf')
-rw-r--r--tools/perf/builtin-record.c15
1 files changed, 9 insertions, 6 deletions
diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c
index e382d93d369..ac989e9ba8f 100644
--- a/tools/perf/builtin-record.c
+++ b/tools/perf/builtin-record.c
@@ -666,12 +666,15 @@ static int __cmd_record(int argc, const char **argv)
nr_counters,
process_synthesized_event,
session);
- if (err <= 0) {
- pr_err("Couldn't record tracing data.\n");
- return err;
- }
-
- advance_output(err);
+ /*
+ * FIXME err <= 0 here actually means that there were no tracepoints
+ * so its not really an error, just that we don't need to synthesize
+ * anything.
+ * We really have to return this more properly and also propagate
+ * errors that now are calling die()
+ */
+ if (err > 0)
+ advance_output(err);
}
machine = perf_session__find_host_machine(session);