]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
perf: record TRACE_INFO only if using tracepoints and SAMPLE_RAW
authorTom Zanussi <tzanussi@gmail.com>
Mon, 3 May 2010 05:14:48 +0000 (00:14 -0500)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Mon, 3 May 2010 13:31:48 +0000 (10:31 -0300)
commit63e0c7715aab6085faa487d498889f4361dc6542
tree3d6923589ed744abeca4e3bb1a6fa512e6e3952b
parent090f7204dfdb5d7f18208ea81dfdba845897cedd
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>
tools/perf/builtin-record.c
tools/perf/util/header.c
tools/perf/util/parse-events.h
tools/perf/util/trace-event-info.c