From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756283AbaCTFlz (ORCPT ); Thu, 20 Mar 2014 01:41:55 -0400 Received: from lgeamrelo02.lge.com ([156.147.1.126]:54032 "EHLO LGEAMRELO02.lge.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751586AbaCTFgw (ORCPT ); Thu, 20 Mar 2014 01:36:52 -0400 X-AuditID: 9c93017e-b7b10ae000000e66-04-532a7e71573d From: Namhyung Kim To: Arnaldo Carvalho de Melo Cc: Peter Zijlstra , Ingo Molnar , Paul Mackerras , Namhyung Kim , Namhyung Kim , LKML , Jiri Olsa , David Ahern , Frederic Weisbecker , Andi Kleen , Arun Sharma , Rodrigo Campos Subject: [PATCH 08/21] perf tools: Save callchain info for each cumulative entry Date: Thu, 20 Mar 2014 14:36:33 +0900 Message-Id: <1395293806-25847-9-git-send-email-namhyung@kernel.org> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1395293806-25847-1-git-send-email-namhyung@kernel.org> References: <1395293806-25847-1-git-send-email-namhyung@kernel.org> X-Brightmail-Tracker: AAAAAA== Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When accumulating callchain entry, also save current snapshot of the chain so that it can show the rest of the chain. Tested-by: Arun Sharma Acked-by: Jiri Olsa Cc: Frederic Weisbecker Signed-off-by: Namhyung Kim --- tools/perf/util/hist.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/tools/perf/util/hist.c b/tools/perf/util/hist.c index c393f13789cb..898cf0155c60 100644 --- a/tools/perf/util/hist.c +++ b/tools/perf/util/hist.c @@ -752,6 +752,14 @@ iter_add_single_cumulative_entry(struct hist_entry_iter *iter, he_cache[iter->curr++] = he; + callchain_append(he->callchain, &callchain_cursor, sample->period); + + /* + * We need to re-initialize the cursor since callchain_append() + * advanced the cursor to the end. + */ + callchain_cursor_commit(&callchain_cursor); + return hist_entry__inc_addr_samples(he, evsel->idx, al->addr); } @@ -765,8 +773,6 @@ iter_next_cumulative_entry(struct hist_entry_iter *iter, if (node == NULL) return 0; - callchain_cursor_advance(&callchain_cursor); - return fill_callchain_info(al, node, iter->hide_unresolved); } @@ -790,6 +796,11 @@ iter_add_next_cumulative_entry(struct hist_entry_iter *iter, .parent = iter->parent, }; int i; + struct callchain_cursor cursor; + + callchain_cursor_snapshot(&cursor, &callchain_cursor); + + callchain_cursor_advance(&callchain_cursor); /* * Check if there's duplicate entries in the callchain. @@ -808,6 +819,8 @@ iter_add_next_cumulative_entry(struct hist_entry_iter *iter, he_cache[iter->curr++] = he; + callchain_append(he->callchain, &cursor, sample->period); + return hist_entry__inc_addr_samples(he, evsel->idx, al->addr); } -- 1.7.11.7