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 09/12] perf hists browser: Fix callchain counting when press ENTER key
Date: Sun, 24 Jan 2016 22:53:32 +0900	[thread overview]
Message-ID: <1453643615-1616-10-git-send-email-namhyung@kernel.org> (raw)
In-Reply-To: <1453643615-1616-1-git-send-email-namhyung@kernel.org>

When counting callchains of the selected entry it should consider
percent limit also.  Otherwise it'll cause hists browser misbehaviing
due to the incorrect total pline count.

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

diff --git a/tools/perf/ui/browsers/hists.c b/tools/perf/ui/browsers/hists.c
index 3d64a6573d0c..a85f85e2b1ee 100644
--- a/tools/perf/ui/browsers/hists.c
+++ b/tools/perf/ui/browsers/hists.c
@@ -153,7 +153,7 @@ static void callchain_list__set_folding(struct callchain_list *cl, bool unfold)
 	cl->unfolded = unfold ? cl->has_children : false;
 }
 
-static int callchain_node__count_rows_rb_tree(struct callchain_node *node)
+static int callchain_node__count_rows_rb_tree(struct callchain_node *node, u64 total)
 {
 	int n = 0;
 	struct rb_node *nd;
@@ -162,6 +162,11 @@ static int callchain_node__count_rows_rb_tree(struct callchain_node *node)
 		struct callchain_node *child = rb_entry(nd, struct callchain_node, rb_node);
 		struct callchain_list *chain;
 		char folded_sign = ' '; /* No children */
+		double percent;
+
+		percent = 100.0 * callchain_cumul_hits(child) / total;
+		if (percent < callchain_param.min_percent)
+			continue;
 
 		list_for_each_entry(chain, &child->val, list) {
 			++n;
@@ -172,7 +177,7 @@ static int callchain_node__count_rows_rb_tree(struct callchain_node *node)
 		}
 
 		if (folded_sign == '-') /* Have children and they're unfolded */
-			n += callchain_node__count_rows_rb_tree(child);
+			n += callchain_node__count_rows_rb_tree(child, total);
 	}
 
 	return n;
@@ -212,11 +217,16 @@ static int callchain_node__count_folded_rows(struct callchain_node *node __maybe
 	return 1;
 }
 
-static int callchain_node__count_rows(struct callchain_node *node)
+static int callchain_node__count_rows(struct callchain_node *node, u64 total)
 {
 	struct callchain_list *chain;
 	char folded_sign = ' ';
 	int n = 0;
+	double percent;
+
+	percent = 100.0 * callchain_cumul_hits(node) / total;
+	if (percent < callchain_param.min_percent)
+		return 0;
 
 	if (callchain_param.mode == CHAIN_FLAT)
 		return callchain_node__count_flat_rows(node);
@@ -232,19 +242,22 @@ static int callchain_node__count_rows(struct callchain_node *node)
 	}
 
 	if (folded_sign == '-')
-		n += callchain_node__count_rows_rb_tree(node);
+		n += callchain_node__count_rows_rb_tree(node, total);
 
 	return n;
 }
 
-static int callchain__count_rows(struct rb_root *chain)
+static int callchain__count_rows(struct hist_entry *he)
 {
+	struct rb_root *chain;
 	struct rb_node *nd;
 	int n = 0;
+	u64 total = hists__total_period(he->hists);
 
+	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);
-		n += callchain_node__count_rows(node);
+		n += callchain_node__count_rows(node, total);
 	}
 
 	return n;
@@ -357,7 +370,7 @@ static bool hist_browser__toggle_fold(struct hist_browser *browser)
 		browser->nr_callchain_rows -= he->nr_rows;
 
 		if (he->unfolded)
-			he->nr_rows = callchain__count_rows(&he->sorted_chain);
+			he->nr_rows = callchain__count_rows(he);
 		else
 			he->nr_rows = 0;
 
-- 
2.6.4

  parent reply	other threads:[~2016-01-24 13:56 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 ` Namhyung Kim [this message]
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 ` [PATCH 11/12] perf hists browser: Update percent base for fractal callchain mode Namhyung Kim
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-10-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).