diff options
author | Tom Zanussi <tzanussi@gmail.com> | 2010-05-03 01:14:48 -0400 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2010-05-03 09:31:48 -0400 |
commit | 63e0c7715aab6085faa487d498889f4361dc6542 (patch) | |
tree | 3d6923589ed744abeca4e3bb1a6fa512e6e3952b /tools/perf/util/header.c | |
parent | 090f7204dfdb5d7f18208ea81dfdba845897cedd (diff) |
perf: record TRACE_INFO only if using tracepoints and SAMPLE_RAW
The current perf code implicitly assumes SAMPLE_RAW means tracepoints
are being used, but doesn't check for that. It happily records the
TRACE_INFO even if SAMPLE_RAW is used without tracepoints, but when the
perf data is read it won't go any further when it finds TRACE_INFO but
no tracepoints, and displays misleading errors.
This adds a check for both in perf-record, and won't record TRACE_INFO
unless both are true. This at least allows perf report -D to dump raw
events, and avoids triggering a misleading error condition in perf
trace. It doesn't actually enable the non-tracepoint raw events to be
displayed in perf trace, since perf trace currently only deals with
tracepoint events.
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>
LKML-Reference: <1272865861.7932.16.camel@tropicana>
Signed-off-by: Tom Zanussi <tzanussi@gmail.com>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf/util/header.c')
-rw-r--r-- | tools/perf/util/header.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c index 79da0e50ef8f..2b9f898efea6 100644 --- a/tools/perf/util/header.c +++ b/tools/perf/util/header.c | |||
@@ -436,7 +436,6 @@ static int perf_header__adds_write(struct perf_header *self, int fd) | |||
436 | trace_sec->size = lseek(fd, 0, SEEK_CUR) - trace_sec->offset; | 436 | trace_sec->size = lseek(fd, 0, SEEK_CUR) - trace_sec->offset; |
437 | } | 437 | } |
438 | 438 | ||
439 | |||
440 | if (perf_header__has_feat(self, HEADER_BUILD_ID)) { | 439 | if (perf_header__has_feat(self, HEADER_BUILD_ID)) { |
441 | struct perf_file_section *buildid_sec; | 440 | struct perf_file_section *buildid_sec; |
442 | 441 | ||