Commit 300aa941 authored Jun 11, 2012 by David Ahern Committed by Arnaldo Carvalho de Melo Jun 27, 2012

perf report: Delay sample_type checks in pipe mode



The pipeline:
  perf record -a -g -o - sleep 5 |perf inject -v -b  | perf report  -g -i -

generates the warning:
  Selected -g but no callchain data. Did you call 'perf record' without -g?

The problem is that the header data is not written to the pipe, so the
sample_type has not been available when perf_report__setup_sample_type
is called. For pipe mode, record dumps the sample type as part of the
synthesized events stream -- perf_event__synthesize_attrs(). Handle this
be detecting pipe mode and not doing early sanity checks on sample_type.

Signed-off-by: David Ahern <dsahern@gmail.com>
Tested-by: Tim Chen <tim.c.chen@linux.intel.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Tim Chen <tim.c.chen@linux.intel.com>
Link: http://lkml.kernel.org/r/1339444121-26236-1-git-send-email-dsahern@gmail.com


Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

parent 08942f6d

tools/perf/builtin-report.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -245,11 +245,12 @@ static int process_read_event(struct perf_tool *tool,
		return 0;
		}

		/* For pipe mode, sample_type is not currently set */
		static int perf_report__setup_sample_type(struct perf_report *rep)
		{
		struct perf_session *self = rep->session;

		if (!(self->sample_type & PERF_SAMPLE_CALLCHAIN)) {
		if (!self->fd_pipe && !(self->sample_type & PERF_SAMPLE_CALLCHAIN)) {
		if (sort__has_parent) {
		ui__error("Selected --sort parent, but no "
		"callchain data. Did you call "
		@@ -272,7 +273,8 @@ static int perf_report__setup_sample_type(struct perf_report *rep)
		}

		if (sort__branch_mode == 1) {
		if (!(self->sample_type & PERF_SAMPLE_BRANCH_STACK)) {
		if (!self->fd_pipe &&
		!(self->sample_type & PERF_SAMPLE_BRANCH_STACK)) {
		ui__error("Selected -b but no branch data. "
		"Did you call perf record without -b?\n");
		return -1;