linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Namhyung Kim <namhyung@kernel.org>
To: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: Ingo Molnar <mingo@kernel.org>,
	Peter Zijlstra <peterz@infradead.org>,
	Jiri Olsa <jolsa@kernel.org>, LKML <linux-kernel@vger.kernel.org>,
	Andi Kleen <andi@firstfloor.org>, David Ahern <dsahern@gmail.com>,
	Frederic Weisbecker <fweisbec@gmail.com>,
	Wang Nan <wangnan0@huawei.com>
Subject: [PATCH 11/12] perf hists browser: Update percent base for fractal callchain mode
Date: Sun, 24 Jan 2016 22:53:34 +0900	[thread overview]
Message-ID: <1453643615-1616-12-git-send-email-namhyung@kernel.org> (raw)
In-Reply-To: <1453643615-1616-1-git-send-email-namhyung@kernel.org>

In the fractal callchain mode (CHAIN_GRAPH_REL), the total period is the
period of that node.  Pass the correct value to calculate the percent
when counting the number of callchain rows.

Signed-off-by: Namhyung Kim <namhyung@kernel.org>
---
 tools/perf/ui/browsers/hists.c | 45 ++++++++++++++++++++++++++++++++++++------
 1 file changed, 39 insertions(+), 6 deletions(-)

diff --git a/tools/perf/ui/browsers/hists.c b/tools/perf/ui/browsers/hists.c
index 3bcd813f65d7..50e62d898e38 100644
--- a/tools/perf/ui/browsers/hists.c
+++ b/tools/perf/ui/browsers/hists.c
@@ -176,8 +176,15 @@ static int callchain_node__count_rows_rb_tree(struct callchain_node *node, u64 t
 				break;
 		}
 
-		if (folded_sign == '-') /* Have children and they're unfolded */
-			n += callchain_node__count_rows_rb_tree(child, total);
+		if (folded_sign == '-') {
+			/* Have children and they're unfolded */
+			u64 new_total = total;
+
+			if (callchain_param.mode == CHAIN_GRAPH_REL)
+				new_total = child->children_hit;
+
+			n += callchain_node__count_rows_rb_tree(child, new_total);
+		}
 	}
 
 	return n;
@@ -254,6 +261,13 @@ static int callchain__count_rows(struct hist_entry *he)
 	int n = 0;
 	u64 total = hists__total_period(he->hists);
 
+	if (callchain_param.mode == CHAIN_GRAPH_REL) {
+		if (symbol_conf.cumulate_callchain)
+			total = he->stat_acc->period;
+		else
+			total = he->stat.period;
+	}
+
 	chain = &he->sorted_chain;
 	for (nd = rb_first(chain); nd; nd = rb_next(nd)) {
 		struct callchain_node *node = rb_entry(nd, struct callchain_node, rb_node);
@@ -408,9 +422,15 @@ static int callchain_node__set_folding_rb_tree(struct callchain_node *node,
 			has_children = chain->has_children;
 		}
 
-		if (has_children)
+		if (has_children) {
+			u64 new_total = total;
+
+			if (callchain_param.mode == CHAIN_GRAPH_REL)
+				new_total = node->children_hit;
+
 			n += callchain_node__set_folding_rb_tree(child, unfold,
-								 total);
+								 new_total);
+		}
 	}
 
 	return n;
@@ -432,9 +452,15 @@ static int callchain_node__set_folding(struct callchain_node *node, bool unfold,
 		has_children = chain->has_children;
 	}
 
-	if (has_children)
+	if (has_children) {
+		u64 new_total = total;
+
+		if (callchain_param.mode == CHAIN_GRAPH_REL)
+			new_total = node->children_hit;
+
 		n += callchain_node__set_folding_rb_tree(node, unfold,
-							 total);
+							 new_total);
+	}
 
 	return n;
 }
@@ -457,6 +483,13 @@ static int callchain__set_folding(struct rb_root *chain, bool unfold, u64 total)
 static void hist_entry__set_folding(struct hist_entry *he, bool unfold,
 				    u64 total)
 {
+	if (callchain_param.mode == CHAIN_GRAPH_REL) {
+		if (symbol_conf.cumulate_callchain)
+			total = he->stat_acc->period;
+		else
+			total = he->stat.period;
+	}
+
 	hist_entry__init_have_children(he);
 	he->unfolded = unfold ? he->has_children : false;
 
-- 
2.6.4

  parent reply	other threads:[~2016-01-24 13:55 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-01-24 13:53 [PATCHSET 00/12] perf tools: Apply percent-limit to callchains Namhyung Kim
2016-01-24 13:53 ` [PATCH 01/12] perf report: Apply --percent-limit to callchains also Namhyung Kim
2016-01-24 13:53 ` [PATCH 02/12] perf report: Apply callchain percent limit on --stdio Namhyung Kim
2016-01-24 13:53 ` [PATCH 03/12] perf report: Get rid of hist_entry__callchain_fprintf() Namhyung Kim
2016-01-24 13:53 ` [PATCH 04/12] perf report: Fix percent calculation on --stdio Namhyung Kim
2016-01-24 13:53 ` [PATCH 05/12] perf report: Hide output pipe for percent-limited callchains on stdio Namhyung Kim
2016-01-24 13:53 ` [PATCH 06/12] perf hists browser: Fix dump to show correct callchain style Namhyung Kim
2016-01-24 13:53 ` [PATCH 07/12] perf hists browser: Fix callchain_node__count_rows() Namhyung Kim
2016-01-26 11:46   ` Jiri Olsa
2016-01-26 12:32     ` Namhyung Kim
2016-01-24 13:53 ` [PATCH 08/12] perf hists browser: Apply callchain percent limit Namhyung Kim
2016-01-24 13:53 ` [PATCH 09/12] perf hists browser: Fix callchain counting when press ENTER key Namhyung Kim
2016-01-24 13:53 ` [PATCH 10/12] perf hists browser: Fix counting callchains when expand/collapse all Namhyung Kim
2016-01-24 13:53 ` Namhyung Kim [this message]
2016-01-24 13:53 ` [PATCH 12/12] perf report: Fix callchain percent limit on --gtk Namhyung Kim
2016-01-25  2:16 ` [PATCHSET 00/12] perf tools: Apply percent-limit to callchains Andi Kleen
2016-01-26 12:14 ` Jiri Olsa
2016-01-26 12:51   ` Namhyung Kim
2016-01-26 13:27     ` Jiri Olsa
2016-01-26 14:10       ` Namhyung Kim
2016-01-26 14:41         ` Jiri Olsa
2016-01-26 14:49           ` Namhyung Kim
2016-01-26 15:18             ` Jiri Olsa
2016-01-26 15:30               ` Arnaldo Carvalho de Melo
2016-01-26 15:41                 ` Jiri Olsa
2016-01-26 15:54                   ` Namhyung Kim
2016-01-26 16:15                     ` Jiri Olsa
2016-01-27 13:21                       ` Namhyung Kim

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1453643615-1616-12-git-send-email-namhyung@kernel.org \
    --to=namhyung@kernel.org \
    --cc=acme@kernel.org \
    --cc=andi@firstfloor.org \
    --cc=dsahern@gmail.com \
    --cc=fweisbec@gmail.com \
    --cc=jolsa@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@kernel.org \
    --cc=peterz@infradead.org \
    --cc=wangnan0@huawei.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).