From: Namhyung Kim <namhyung....@lge.com>
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.
Cc: Jiri Olsa <jo...@redhat.com>
Cc: Stephane Eranian <eran...@google.com>
Signed-off-by: Namhyung Kim <namhy...@kernel.org>
---
tools/perf/builtin-diff.c | 2 +-
tools/perf/util/hist.c | 12 +++++++++---
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/tools/perf/builtin-diff.c b/tools/perf/builtin-diff.c
index b2e7d39f099b..4dda6f4dc618 100644
--- a/tools/perf/builtin-diff.c
+++ b/tools/perf/builtin-diff.c
@@ -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;
diff --git a/tools/perf/util/hist.c b/tools/perf/util/hist.c
index 82df1b26f0d4..3a9ccd09835d 100644
--- a/tools/perf/util/hist.c
+++ b/tools/perf/util/hist.c
@@ -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;
--
1.7.11.7
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
