Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751959AbcDPTqT (ORCPT ); Sat, 16 Apr 2016 15:46:19 -0400 Received: from out2-smtp.messagingengine.com ([66.111.4.26]:56159 "EHLO out2-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751614AbcDPTqS (ORCPT ); Sat, 16 Apr 2016 15:46:18 -0400 X-Sasl-enc: uLETOeTb4U3AsoukcPZD5vfriHkVXFqHOCFAmGC6QuAo 1460835976 Date: Sat, 16 Apr 2016 12:46:14 -0700 From: Andres Freund To: tglx@linutronix.de, a.p.zijlstra@chello.nl, namhyung@kernel.org, linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@kernel.org, acme@redhat.com Cc: linux-tip-commits@vger.kernel.org Subject: Re: [tip:perf/urgent] perf hists: Fix determination of a callchain node's childlessness Message-ID: <20160416194614.l6liupm35rmhg3ht@alap3.anarazel.de> References: <20160330190245.GB13305@awork2.anarazel.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2154 Lines: 53 Hi, Perhaps this should also go into stable? It'd be nice to fix that regression for 4.4 and 4.5. Regards, Andres On 2016-03-30 23:33:37 -0700, tip-bot for Andres Freund wrote: > Commit-ID: 909890355507e92bdaf648e73870f6b5df606da8 > Gitweb: http://git.kernel.org/tip/909890355507e92bdaf648e73870f6b5df606da8 > Author: Andres Freund > AuthorDate: Wed, 30 Mar 2016 21:02:45 +0200 > Committer: Arnaldo Carvalho de Melo > CommitDate: Wed, 30 Mar 2016 18:08:39 -0300 > > perf hists: Fix determination of a callchain node's childlessness > > The 4b3a3212233a ("perf hists browser: Support flat callchains") commit > over-aggressively tried to optimize callchain_node__init_have_children(). > > That lead to --tui mode not allowing to expand call chain elements if a > call chain element had only one parent. That's why --inverted callgraphs > looked halfway sane, but plain ones didn't. > > Revert that individual optimization, it wasn't really related to the > rest of the commit. > > Signed-off-by: Andres Freund > Acked-by: Namhyung Kim > Tested-by: Arnaldo Carvalho de Melo > Cc: Peter Zijlstra > Fixes: 4b3a3212233a ("perf hists browser: Support flat callchains") > Link: http://lkml.kernel.org/r/20160330190245.GB13305@awork2.anarazel.de > Signed-off-by: Arnaldo Carvalho de Melo > --- > tools/perf/ui/browsers/hists.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/tools/perf/ui/browsers/hists.c b/tools/perf/ui/browsers/hists.c > index 4b98165..2a83414 100644 > --- a/tools/perf/ui/browsers/hists.c > +++ b/tools/perf/ui/browsers/hists.c > @@ -337,7 +337,7 @@ static void callchain_node__init_have_children(struct callchain_node *node, > chain = list_entry(node->val.next, struct callchain_list, list); > chain->has_children = has_sibling; > > - if (node->val.next != node->val.prev) { > + if (!list_empty(&node->val)) { > chain = list_entry(node->val.prev, struct callchain_list, list); > chain->has_children = !RB_EMPTY_ROOT(&node->rb_root); > }