Commit 354cc40e authored Oct 01, 2013 by Andi Kleen Committed by Ingo Molnar Oct 04, 2013

tools/perf: Fix sorting for 64bit entries



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>
Signed-off-by: Andi Kleen <ak@linux.intel.com>
Signed-off-by: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/1380637335-30110-1-git-send-email-andi@firstfloor.org


Signed-off-by: Ingo Molnar <mingo@kernel.org>

parent fafd883f

tools/perf/util/hist.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -346,7 +346,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;

		@@ -884,7 +884,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;

Admin message