提交 354cc40e 编写于 作者: A Andi Kleen 提交者: Ingo Molnar

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: NNamhyung Kim <namhyung@kernel.org>
Signed-off-by: NAndi Kleen <ak@linux.intel.com>
Signed-off-by: NPeter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/1380637335-30110-1-git-send-email-andi@firstfloor.orgSigned-off-by: NIngo Molnar <mingo@kernel.org>
上级 fafd883f
...@@ -346,7 +346,7 @@ static struct hist_entry *add_hist_entry(struct hists *hists, ...@@ -346,7 +346,7 @@ static struct hist_entry *add_hist_entry(struct hists *hists,
struct rb_node **p; struct rb_node **p;
struct rb_node *parent = NULL; struct rb_node *parent = NULL;
struct hist_entry *he; struct hist_entry *he;
int cmp; int64_t cmp;
p = &hists->entries_in->rb_node; p = &hists->entries_in->rb_node;
...@@ -884,7 +884,7 @@ static struct hist_entry *hists__add_dummy_entry(struct hists *hists, ...@@ -884,7 +884,7 @@ static struct hist_entry *hists__add_dummy_entry(struct hists *hists,
struct rb_node **p; struct rb_node **p;
struct rb_node *parent = NULL; struct rb_node *parent = NULL;
struct hist_entry *he; struct hist_entry *he;
int cmp; int64_t cmp;
if (sort__need_collapse) if (sort__need_collapse)
root = &hists->entries_collapsed; root = &hists->entries_collapsed;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册