diff options
author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2009-11-21 11:31:26 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-11-21 11:45:59 -0500 |
commit | e25613683bd5c46d3e8c8ae6416dccc9f357dcdc (patch) | |
tree | a78a494c84d705d8505bd45e80fe7375943bb76e /tools/perf/util/trace-event-read.c | |
parent | c12e15e71d4b32da045e798ffd21cbb6197d1c65 (diff) |
perf trace: Read_tracing_data should die() another day
It better propagate errors, also if we do a simple:
[root@doppio linux-2.6-tip]# perf record -R -a -f sleep 3s ;
perf trace [ perf record: Woken up 1 times to write data ]
[ perf record: Captured and wrote 0.182 MB perf.data (~7972 samples) ]
Fatal: not an trace data file
[root@doppio linux-2.6-tip]#
That is what is expected, right? I.e. as we didn't specify any
tracepoint event via -e, it should gracefully bail out and not
SEGFAULT.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Frédéric Weisbecker <fweisbec@gmail.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Paul Mackerras <paulus@samba.org>
LKML-Reference: <1258821086-11521-3-git-send-email-acme@infradead.org>
[ Fixed the error messages some more ]
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'tools/perf/util/trace-event-read.c')
-rw-r--r-- | tools/perf/util/trace-event-read.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/perf/util/trace-event-read.c b/tools/perf/util/trace-event-read.c index 44292e06cca4..342dfdd43f87 100644 --- a/tools/perf/util/trace-event-read.c +++ b/tools/perf/util/trace-event-read.c | |||
@@ -471,11 +471,11 @@ void trace_report(int fd) | |||
471 | 471 | ||
472 | read_or_die(buf, 3); | 472 | read_or_die(buf, 3); |
473 | if (memcmp(buf, test, 3) != 0) | 473 | if (memcmp(buf, test, 3) != 0) |
474 | die("not an trace data file"); | 474 | die("no trace data in the file"); |
475 | 475 | ||
476 | read_or_die(buf, 7); | 476 | read_or_die(buf, 7); |
477 | if (memcmp(buf, "tracing", 7) != 0) | 477 | if (memcmp(buf, "tracing", 7) != 0) |
478 | die("not a trace file (missing tracing)"); | 478 | die("not a trace file (missing 'tracing' tag)"); |
479 | 479 | ||
480 | version = read_string(); | 480 | version = read_string(); |
481 | if (show_version) | 481 | if (show_version) |