From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753665Ab2K2Gnv (ORCPT ); Thu, 29 Nov 2012 01:43:51 -0500 Received: from LGEMRELSE1Q.lge.com ([156.147.1.111]:57376 "EHLO LGEMRELSE1Q.lge.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752596Ab2K2GjI (ORCPT ); Thu, 29 Nov 2012 01:39:08 -0500 X-AuditID: 9c93016f-b7b86ae000003a75-c3-50b70309eae1 From: Namhyung Kim To: Arnaldo Carvalho de Melo Cc: Peter Zijlstra , Paul Mackerras , Ingo Molnar , LKML , Jiri Olsa , Stephane Eranian , Andi Kleen , Namhyung Kim Subject: [PATCH 07/18] perf hists: Exchange order of comparing items when collapsing hists Date: Thu, 29 Nov 2012 15:38:35 +0900 Message-Id: <1354171126-14387-9-git-send-email-namhyung@kernel.org> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1354171126-14387-1-git-send-email-namhyung@kernel.org> References: <1354171126-14387-1-git-send-email-namhyung@kernel.org> X-Brightmail-Tracker: AAAAAA== Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 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); -- 1.7.11.7