From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757146AbbCNHFT (ORCPT ); Sat, 14 Mar 2015 03:05:19 -0400 Received: from terminus.zytor.com ([198.137.202.10]:40271 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757088AbbCNHFP (ORCPT ); Sat, 14 Mar 2015 03:05:15 -0400 Date: Sat, 14 Mar 2015 00:04:50 -0700 From: tip-bot for He Kuang Message-ID: Cc: namhyung@kernel.org, hpa@zytor.com, linux-kernel@vger.kernel.org, tglx@linutronix.de, a.p.zijlstra@chello.nl, hekuang@huawei.com, paulus@samba.org, acme@redhat.com, mingo@kernel.org, jolsa@kernel.org, wangnan0@huawei.com Reply-To: linux-kernel@vger.kernel.org, tglx@linutronix.de, namhyung@kernel.org, hpa@zytor.com, jolsa@kernel.org, mingo@kernel.org, wangnan0@huawei.com, hekuang@huawei.com, paulus@samba.org, a.p.zijlstra@chello.nl, acme@redhat.com In-Reply-To: <1426077363-855-2-git-send-email-hekuang@huawei.com> References: <1426077363-855-2-git-send-email-hekuang@huawei.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf hists browser: Fix UI bug after zoom into thread/dso/symbol Git-Commit-ID: a8cd1f4393032cd87e98803346865cdbceb15ad3 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: a8cd1f4393032cd87e98803346865cdbceb15ad3 Gitweb: http://git.kernel.org/tip/a8cd1f4393032cd87e98803346865cdbceb15ad3 Author: He Kuang AuthorDate: Wed, 11 Mar 2015 20:36:03 +0800 Committer: Arnaldo Carvalho de Melo CommitDate: Thu, 12 Mar 2015 12:39:59 -0300 perf hists browser: Fix UI bug after zoom into thread/dso/symbol When zoom into thread/dso/symbol, the fold/unfold stat is cleared in hists__filter_by_thread/dso/symbol(), but h->nr_rows is not cleared. So if we toggle fold stat on the unfold entires, nr_entries got a wrong value. This bug can be reproduced as follows: $ perf record -g -e syscalls:sys_enter_open ls $ perf report Children Self Command Shared Object Symbol ================================================================ + 50.00% 0.00% ls ld64.so [.] _dl_get_ready_to_run - 50.00% 0.00% ls ld64.so [.] _dl_load_shared_library _dl_load_shared_library <= [Zoom into thread/dso] _dl_get_ready_to_run _start ... In the new thread hists, all entries reset to fold, if we unfold the same entry as we previously unfolded, nr_entries got wrong value, and we can't move down cursor to bottom row. Thread: ls Children Self Command Shared Object Symbol ================================================================ + 50.00% 0.00% ls ld64.so [.] _dl_get_ready_to_run - 50.00% 0.00% ls ld64.so [.] _dl_load_shared_library _dl_load_shared_library _dl_get_ready_to_run <= [cursor may stop here, can't move down] _start ... This patch clear h->nr_rows to fix this bug. Signed-off-by: He Kuang Cc: Jiri Olsa Cc: Namhyung Kim Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Wang Nan Link: http://lkml.kernel.org/r/1426077363-855-2-git-send-email-hekuang@huawei.com Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/hist.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/perf/util/hist.c b/tools/perf/util/hist.c index 95f5ab7..d9a6d35 100644 --- a/tools/perf/util/hist.c +++ b/tools/perf/util/hist.c @@ -1171,6 +1171,7 @@ static void hists__remove_entry_filter(struct hists *hists, struct hist_entry *h /* force fold unfiltered entry for simplicity */ h->ms.unfolded = false; h->row_offset = 0; + h->nr_rows = 0; hists->stats.nr_non_filtered_samples += h->stat.nr_events;