[PATCH 03/14] perf script: Check sample->callchain before using it

Path	csiph.com!news.mixmin.net!aioe.org!bofh.it!news.nic.it!robomod
From	Arnaldo Carvalho de Melo <acme@kernel.org>
Newsgroups	linux.kernel
Subject	[PATCH 03/14] perf script: Check sample->callchain before using it
Date	Tue, 19 Apr 2016 18:00:03 +0200
Message-ID	<rpGef-KT-39@gated-at.bofh.it> (permalink)
References	<rpGee-KT-7@gated-at.bofh.it>
X-Original-To	Ingo Molnar <mingo@kernel.org>
X-Mailer	git-send-email 2.5.5
X-Srs-Rewrite	SMTP reverse-path rewritten from <acme@infradead.org> by bombadil.infradead.org. See http://www.infradead.org/rpr.html
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	32
Organization	linux.* mail to news gateway
X-Original-Cc	linux-kernel@vger.kernel.org, Arnaldo Carvalho de Melo <acme@redhat.com>, Adrian Hunter <adrian.hunter@intel.com>, David Ahern <dsahern@gmail.com>, Jiri Olsa <jolsa@kernel.org>, Milian Wolff <milian.wolff@kdab.com>, Namhyung Kim <namhyung@kernel.org>, Wang Nan <wangnan0@huawei.com>
X-Original-Date	Tue, 19 Apr 2016 12:50:30 -0300
X-Original-Message-ID	<1461081041-10580-4-git-send-email-acme@kernel.org>
X-Original-References	<1461081041-10580-1-git-send-email-acme@kernel.org>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1382644

Show key headers only | View raw

From: Arnaldo Carvalho de Melo <acme@redhat.com>

Found by code inspection, while looking at thread__resolve_callchain()
callsites, one had it, the other didn't.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Milian Wolff <milian.wolff@kdab.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/n/tip-6r8i2afd3523thuuaxl39yhk@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/builtin-script.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c
index 0e93282b405e..5099740aa50b 100644
--- a/tools/perf/builtin-script.c
+++ b/tools/perf/builtin-script.c
@@ -791,7 +791,7 @@ static void process_event(struct perf_script *script,
 	if (PRINT_FIELD(IP)) {
 		struct callchain_cursor *cursor = NULL, cursor_callchain;
 
-		if (symbol_conf.use_callchain &&
+		if (symbol_conf.use_callchain && sample->callchain &&
 		    thread__resolve_callchain(al->thread, &cursor_callchain, evsel,
 					      sample, NULL, NULL, scripting_max_stack) == 0)
 			cursor = &cursor_callchain;
-- 
2.5.5

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

[PATCH 03/14] perf script: Check sample->callchain before using it Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-04-19 18:00 +0200

csiph-web