From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754273AbcAXNzJ (ORCPT ); Sun, 24 Jan 2016 08:55:09 -0500 Received: from mail-pa0-f68.google.com ([209.85.220.68]:34062 "EHLO mail-pa0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752057AbcAXNzB (ORCPT ); Sun, 24 Jan 2016 08:55:01 -0500 From: Namhyung Kim To: Arnaldo Carvalho de Melo Cc: Ingo Molnar , Peter Zijlstra , Jiri Olsa , LKML , Andi Kleen , David Ahern , Frederic Weisbecker , Wang Nan Subject: [PATCH 07/12] perf hists browser: Fix callchain_node__count_rows() Date: Sun, 24 Jan 2016 22:53:30 +0900 Message-Id: <1453643615-1616-8-git-send-email-namhyung@kernel.org> X-Mailer: git-send-email 2.6.4 In-Reply-To: <1453643615-1616-1-git-send-email-namhyung@kernel.org> References: <1453643615-1616-1-git-send-email-namhyung@kernel.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Like other functions, it should stop counting if there's any folded callchain. Because of this it occasionally lose the cursor at the end. Signed-off-by: Namhyung Kim --- tools/perf/ui/browsers/hists.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/tools/perf/ui/browsers/hists.c b/tools/perf/ui/browsers/hists.c index 349c5de73287..c7ca36dae89f 100644 --- a/tools/perf/ui/browsers/hists.c +++ b/tools/perf/ui/browsers/hists.c @@ -215,7 +215,7 @@ static int callchain_node__count_folded_rows(struct callchain_node *node __maybe static int callchain_node__count_rows(struct callchain_node *node) { struct callchain_list *chain; - bool unfolded = false; + char folded_sign = ' '; int n = 0; if (callchain_param.mode == CHAIN_FLAT) @@ -225,10 +225,13 @@ static int callchain_node__count_rows(struct callchain_node *node) list_for_each_entry(chain, &node->val, list) { ++n; - unfolded = chain->unfolded; + + folded_sign = callchain_list__folded(chain); + if (folded_sign == '+') + break; } - if (unfolded) + if (folded_sign == '-') n += callchain_node__count_rows_rb_tree(node); return n; -- 2.6.4