Commit 98526ee7 authored Jul 31, 2014 by Adrian Hunter Committed by Arnaldo Carvalho de Melo Aug 13, 2014

perf script: Allow callchains if any event samples them



perf script was not displaying callchains if any selected event did not
have PERF_SAMPLE_CALLCHAIN.

Change this to disable callchains only if all selected events do not
have PERF_SAMPLE_CALLCHAIN.

Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@gmail.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/r/1406786474-9306-17-git-send-email-adrian.hunter@intel.com


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

parent 5a52f33a

tools/perf/builtin-script.c

+13 −4

Original line number	Diff line number	Diff line
		@@ -184,10 +184,6 @@ static int perf_evsel__check_attr(struct perf_evsel *evsel,
		if (perf_evsel__check_stype(evsel, PERF_SAMPLE_IP, "IP",
		PERF_OUTPUT_IP))
		return -EINVAL;

		if (!no_callchain &&
		!(attr->sample_type & PERF_SAMPLE_CALLCHAIN))
		symbol_conf.use_callchain = false;
		}

		if (PRINT_FIELD(ADDR) &&
		@@ -290,6 +286,19 @@ static int perf_session__check_output_opt(struct perf_session *session)
		set_print_ip_opts(&evsel->attr);
		}

		if (!no_callchain) {
		bool use_callchain = false;

		evlist__for_each(session->evlist, evsel) {
		if (evsel->attr.sample_type & PERF_SAMPLE_CALLCHAIN) {
		use_callchain = true;
		break;
		}
		}
		if (!use_callchain)
		symbol_conf.use_callchain = false;
		}

		/*
		* set default for tracepoints to print symbols only
		* if callchains are present