From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932395AbcBCKXW (ORCPT ); Wed, 3 Feb 2016 05:23:22 -0500 Received: from terminus.zytor.com ([198.137.202.10]:54920 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756810AbcBCKXS (ORCPT ); Wed, 3 Feb 2016 05:23:18 -0500 Date: Wed, 3 Feb 2016 02:22:40 -0800 From: tip-bot for Namhyung Kim Message-ID: Cc: jolsa@kernel.org, hpa@zytor.com, wangnan0@huawei.com, linux-kernel@vger.kernel.org, dsahern@gmail.com, peterz@infradead.org, andi@firstfloor.org, mingo@kernel.org, fweisbec@gmail.com, namhyung@kernel.org, acme@redhat.com, tglx@linutronix.de Reply-To: namhyung@kernel.org, fweisbec@gmail.com, mingo@kernel.org, andi@firstfloor.org, tglx@linutronix.de, acme@redhat.com, wangnan0@huawei.com, hpa@zytor.com, jolsa@kernel.org, peterz@infradead.org, dsahern@gmail.com, linux-kernel@vger.kernel.org In-Reply-To: <1453909257-26015-6-git-send-email-namhyung@kernel.org> References: <1453909257-26015-6-git-send-email-namhyung@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf callchain: Pass parent_samples to __callchain__fprintf_graph() Git-Commit-ID: 54d27b3119e2eecbb3dfbf821db90fab25f6c523 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 54d27b3119e2eecbb3dfbf821db90fab25f6c523 Gitweb: http://git.kernel.org/tip/54d27b3119e2eecbb3dfbf821db90fab25f6c523 Author: Namhyung Kim AuthorDate: Thu, 28 Jan 2016 00:40:52 +0900 Committer: Arnaldo Carvalho de Melo CommitDate: Mon, 1 Feb 2016 17:39:52 -0300 perf callchain: Pass parent_samples to __callchain__fprintf_graph() Pass hist entry's period to graph callchain print function. This info is needed by later patch to determine whether it can omit percentage of top-level node or not. No functional change intended. Signed-off-by: Namhyung Kim Cc: Andi Kleen Cc: David Ahern Cc: Frederic Weisbecker Cc: Jiri Olsa Cc: Peter Zijlstra Cc: Wang Nan Link: http://lkml.kernel.org/r/1453909257-26015-6-git-send-email-namhyung@kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/ui/stdio/hist.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/tools/perf/ui/stdio/hist.c b/tools/perf/ui/stdio/hist.c index 8e25f7d..96188ea 100644 --- a/tools/perf/ui/stdio/hist.c +++ b/tools/perf/ui/stdio/hist.c @@ -166,7 +166,8 @@ static size_t __callchain__fprintf_graph(FILE *fp, struct rb_root *root, } static size_t callchain__fprintf_graph(FILE *fp, struct rb_root *root, - u64 total_samples, int left_margin) + u64 total_samples, u64 parent_samples, + int left_margin) { struct callchain_node *cnode; struct callchain_list *chain; @@ -213,6 +214,9 @@ static size_t callchain__fprintf_graph(FILE *fp, struct rb_root *root, root = &cnode->rb_root; } + if (callchain_param.mode == CHAIN_GRAPH_REL) + total_samples = parent_samples; + ret += __callchain__fprintf_graph(fp, root, total_samples, 1, 1, left_margin); ret += fprintf(fp, "\n"); @@ -323,16 +327,19 @@ static size_t hist_entry_callchain__fprintf(struct hist_entry *he, u64 total_samples, int left_margin, FILE *fp) { + u64 parent_samples = he->stat.period; + + if (symbol_conf.cumulate_callchain) + parent_samples = he->stat_acc->period; + switch (callchain_param.mode) { case CHAIN_GRAPH_REL: - return callchain__fprintf_graph(fp, &he->sorted_chain, - symbol_conf.cumulate_callchain ? - he->stat_acc->period : he->stat.period, - left_margin); + return callchain__fprintf_graph(fp, &he->sorted_chain, total_samples, + parent_samples, left_margin); break; case CHAIN_GRAPH_ABS: return callchain__fprintf_graph(fp, &he->sorted_chain, total_samples, - left_margin); + parent_samples, left_margin); break; case CHAIN_FLAT: return callchain__fprintf_flat(fp, &he->sorted_chain, total_samples);