[PATCH] perf, tools: Fix sorting for 64bit entries

[PATCH] perf, tools: Fix sorting for 64bit entries

[Andi Kleen]

From: Andi Kleen <ak@linux.intel.com>

Some of the node comparisons in hist.c dropped the upper
32bit by using an int variable to store the compare
result. This broke various 64bit fields, causing
incorrect collapsing (found for the TSX transaction field)

Just use int64_t always.

Signed-off-by: Andi Kleen <ak@linux.intel.com>
---
 tools/perf/util/hist.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/perf/util/hist.c b/tools/perf/util/hist.c
index 4714a72..4832b59 100644
--- a/tools/perf/util/hist.c
+++ b/tools/perf/util/hist.c
@@ -350,7 +350,7 @@ static struct hist_entry *add_hist_entry(struct hists *hists,
 	struct rb_node **p;
 	struct rb_node *parent = NULL;
 	struct hist_entry *he;
-	int cmp;
+	int64_t cmp;
 
 	p = &hists->entries_in->rb_node;
 
@@ -887,7 +887,7 @@ static struct hist_entry *hists__add_dummy_entry(struct hists *hists,
 	struct rb_node **p;
 	struct rb_node *parent = NULL;
 	struct hist_entry *he;
-	int cmp;
+	int64_t cmp;
 
 	if (sort__need_collapse)
 		root = &hists->entries_collapsed;
-- 
1.8.3.1

Re: [PATCH] perf, tools: Fix sorting for 64bit entries

[Namhyung Kim]

Hi Andi,

On Fri, 27 Sep 2013 16:39:24 -0700, Andi Kleen wrote:
> From: Andi Kleen <ak@linux.intel.com>
>
> Some of the node comparisons in hist.c dropped the upper
> 32bit by using an int variable to store the compare
> result. This broke various 64bit fields, causing
> incorrect collapsing (found for the TSX transaction field)
>
> Just use int64_t always.

Acked-by: Namhyung Kim <namhyung@kernel.org>

Thanks,
Namhyung

Re: [PATCH] perf, tools: Fix sorting for 64bit entries

[Arnaldo Carvalho de Melo]

Em Fri, Sep 27, 2013 at 04:39:24PM -0700, Andi Kleen escreveu:
> From: Andi Kleen <ak@linux.intel.com>
> 
> Some of the node comparisons in hist.c dropped the upper
> 32bit by using an int variable to store the compare
> result. This broke various 64bit fields, causing
> incorrect collapsing (found for the TSX transaction field)
> 
> Just use int64_t always.

Thanks, applied.