mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-21 08:19:28 +00:00
perf hists: Exchange order of comparing items when collapsing hists
When comparing entries for collapsing put the given entry first, and then the iterated entry. This is not the case of hist_entry__cmp() when called if given sort keys don't require collapsing. So change the order for the sake of consistency. It will be required for matching and/or linking multiple hist entries. Signed-off-by: Namhyung Kim <namhyung@kernel.org> Acked-by: Jiri Olsa <jolsa@redhat.com> Cc: Ingo Molnar <mingo@kernel.org> Cc: Jiri Olsa <jolsa@redhat.com> Cc: Paul Mackerras <paulus@samba.org> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Cc: Stephane Eranian <eranian@google.com> Link: http://lkml.kernel.org/r/1355128197-18193-2-git-send-email-namhyung@kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
parent
203e04c163
commit
9afcf930b1
2 changed files with 10 additions and 4 deletions
|
@ -285,7 +285,7 @@ static void insert_hist_entry_by_name(struct rb_root *root,
|
|||
while (*p != NULL) {
|
||||
parent = *p;
|
||||
iter = rb_entry(parent, struct hist_entry, rb_node);
|
||||
if (hist_entry__cmp(he, iter) < 0)
|
||||
if (hist_entry__cmp(iter, he) < 0)
|
||||
p = &(*p)->rb_left;
|
||||
else
|
||||
p = &(*p)->rb_right;
|
||||
|
|
|
@ -285,7 +285,13 @@ static struct hist_entry *add_hist_entry(struct hists *hists,
|
|||
parent = *p;
|
||||
he = rb_entry(parent, struct hist_entry, rb_node_in);
|
||||
|
||||
cmp = hist_entry__cmp(entry, he);
|
||||
/*
|
||||
* Make sure that it receives arguments in a same order as
|
||||
* hist_entry__collapse() so that we can use an appropriate
|
||||
* function when searching an entry regardless which sort
|
||||
* keys were used.
|
||||
*/
|
||||
cmp = hist_entry__cmp(he, entry);
|
||||
|
||||
if (!cmp) {
|
||||
he_stat__add_period(&he->stat, period);
|
||||
|
@ -729,7 +735,7 @@ static struct hist_entry *hists__add_dummy_entry(struct hists *hists,
|
|||
parent = *p;
|
||||
he = rb_entry(parent, struct hist_entry, rb_node);
|
||||
|
||||
cmp = hist_entry__cmp(pair, he);
|
||||
cmp = hist_entry__cmp(he, pair);
|
||||
|
||||
if (!cmp)
|
||||
goto out;
|
||||
|
@ -759,7 +765,7 @@ static struct hist_entry *hists__find_entry(struct hists *hists,
|
|||
|
||||
while (n) {
|
||||
struct hist_entry *iter = rb_entry(n, struct hist_entry, rb_node);
|
||||
int64_t cmp = hist_entry__cmp(he, iter);
|
||||
int64_t cmp = hist_entry__cmp(iter, he);
|
||||
|
||||
if (cmp < 0)
|
||||
n = n->rb_left;
|
||||
|
|
Loading…
Reference in a new issue