From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753272Ab2K3QJ5 (ORCPT ); Fri, 30 Nov 2012 11:09:57 -0500 Received: from mail-oa0-f46.google.com ([209.85.219.46]:47390 "EHLO mail-oa0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751894Ab2K3QJz (ORCPT ); Fri, 30 Nov 2012 11:09:55 -0500 Date: Thu, 29 Nov 2012 15:52:57 -0300 From: Arnaldo Carvalho de Melo To: Namhyung Kim Cc: Peter Zijlstra , Paul Mackerras , Ingo Molnar , LKML , Jiri Olsa , Stephane Eranian , Andi Kleen , Namhyung Kim Subject: Re: [PATCH 07/18] perf hists: Exchange order of comparing items when collapsing hists Message-ID: <20121129185257.GC1957@ghostprotocols.net> References: <1354171126-14387-1-git-send-email-namhyung@kernel.org> <1354171126-14387-9-git-send-email-namhyung@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1354171126-14387-9-git-send-email-namhyung@kernel.org> X-Url: http://acmel.wordpress.com User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Em Thu, Nov 29, 2012 at 03:38:35PM +0900, Namhyung Kim escreveu: > From: Namhyung Kim > > When comparing entries for collapsing put the given entry first, and > then the iterated entry. This is for the sake of consistency and will consistency with what? and, see below: > be required by the event group report. > > Cc: Jiri Olsa > Cc: Stephane Eranian > Signed-off-by: Namhyung Kim > --- > tools/perf/util/hist.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/tools/perf/util/hist.c b/tools/perf/util/hist.c > index 82df1b26f0d4..161c35e7ed0e 100644 > --- a/tools/perf/util/hist.c > +++ b/tools/perf/util/hist.c > @@ -433,7 +433,7 @@ static bool hists__collapse_insert_entry(struct hists *hists __maybe_unused, > parent = *p; > iter = rb_entry(parent, struct hist_entry, rb_node_in); > > - cmp = hist_entry__collapse(iter, he); > + cmp = hist_entry__collapse(he, iter); > > if (!cmp) { > he_stat__add_stat(&iter->stat, &he->stat); doesn't this now gets inconsistent with the hist_entry__collapse() call? I.e. iter first, he after, also there is the case for callchains, below, care to elaborate here? > -- > 1.7.11.7