From e29cb7800afee574aaf390563b493bb7e9588382 Mon Sep 17 00:00:00 2001
From: Arnaldo Carvalho de Melo <acme@redhat.com>
Date: Thu, 8 Nov 2012 17:54:33 -0300
Subject: [PATCH] --- yaml --- r: 338975 b: refs/heads/master c:
 95529be47855be6350dfd0b9cd09ea863ca7421f h: refs/heads/master i:   338973:
 facb12917344afc79b4e034b623ffc75c5ea1114   338971:
 db4e4ad9b287aabdd4e4208e457e4dc473fce3a2   338967:
 93c346c5a23fa59c12ae2fffc38a9b24223f4c60   338959:
 379316530a5b012fd262f2668e422aa66f56045e   338943:
 a8b5b06a001d4d6d40a154b41e6ff722d71aa1d9 v: v3

---
 [refs]                          |  2 +-
 trunk/tools/perf/builtin-diff.c | 35 +------------------------------
 trunk/tools/perf/util/hist.c    | 37 +++++++++++++++++++++++++++++++++
 trunk/tools/perf/util/hist.h    |  2 ++
 4 files changed, 41 insertions(+), 35 deletions(-)

diff --git a/[refs] b/[refs]
index bcead9536152..95bd52a6324f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b821c7325354c589ccc9611cf9e6b0d7490ed6a6
+refs/heads/master: 95529be47855be6350dfd0b9cd09ea863ca7421f
diff --git a/trunk/tools/perf/builtin-diff.c b/trunk/tools/perf/builtin-diff.c
index 8a9db38e562f..e99fb3bc1c2d 100644
--- a/trunk/tools/perf/builtin-diff.c
+++ b/trunk/tools/perf/builtin-diff.c
@@ -334,39 +334,6 @@ static void hists__name_resort(struct hists *self, bool sort)
 		self->entries = tmp;
 }
 
-static struct hist_entry *hists__find_entry(struct hists *self,
-					    struct hist_entry *he)
-{
-	struct rb_node *n = self->entries.rb_node;
-
-	while (n) {
-		struct hist_entry *iter = rb_entry(n, struct hist_entry, rb_node);
-		int64_t cmp = hist_entry__cmp(he, iter);
-
-		if (cmp < 0)
-			n = n->rb_left;
-		else if (cmp > 0)
-			n = n->rb_right;
-		else
-			return iter;
-	}
-
-	return NULL;
-}
-
-static void hists__match(struct hists *older, struct hists *newer)
-{
-	struct rb_node *nd;
-
-	for (nd = rb_first(&newer->entries); nd; nd = rb_next(nd)) {
-		struct hist_entry *pos = rb_entry(nd, struct hist_entry, rb_node),
-				  *pair = hists__find_entry(older, pos);
-
-		if (pair)
-			hist__entry_add_pair(pos, pair);
-	}
-}
-
 static struct perf_evsel *evsel_match(struct perf_evsel *evsel,
 				      struct perf_evlist *evlist)
 {
@@ -520,7 +487,7 @@ static void hists__compute_resort(struct hists *hists)
 
 static void hists__process(struct hists *old, struct hists *new)
 {
-	hists__match(old, new);
+	hists__match(new, old);
 
 	if (show_baseline_only)
 		hists__baseline_only(new);
diff --git a/trunk/tools/perf/util/hist.c b/trunk/tools/perf/util/hist.c
index f42de79d2e6b..c1de3b05fe09 100644
--- a/trunk/tools/perf/util/hist.c
+++ b/trunk/tools/perf/util/hist.c
@@ -716,3 +716,40 @@ void hists__inc_nr_events(struct hists *hists, u32 type)
 	++hists->stats.nr_events[0];
 	++hists->stats.nr_events[type];
 }
+
+static struct hist_entry *hists__find_entry(struct hists *hists,
+					    struct hist_entry *he)
+{
+	struct rb_node *n = hists->entries.rb_node;
+
+	while (n) {
+		struct hist_entry *iter = rb_entry(n, struct hist_entry, rb_node);
+		int64_t cmp = hist_entry__cmp(he, iter);
+
+		if (cmp < 0)
+			n = n->rb_left;
+		else if (cmp > 0)
+			n = n->rb_right;
+		else
+			return iter;
+	}
+
+	return NULL;
+}
+
+/*
+ * Look for pairs to link to the leader buckets (hist_entries):
+ */
+void hists__match(struct hists *leader, struct hists *other)
+{
+	struct rb_node *nd;
+	struct hist_entry *pos, *pair;
+
+	for (nd = rb_first(&leader->entries); nd; nd = rb_next(nd)) {
+		pos  = rb_entry(nd, struct hist_entry, rb_node);
+		pair = hists__find_entry(other, pos);
+
+		if (pair)
+			hist__entry_add_pair(pos, pair);
+	}
+}
diff --git a/trunk/tools/perf/util/hist.h b/trunk/tools/perf/util/hist.h
index a4f45dd04697..ff1c3963e04f 100644
--- a/trunk/tools/perf/util/hist.h
+++ b/trunk/tools/perf/util/hist.h
@@ -115,6 +115,8 @@ bool hists__new_col_len(struct hists *self, enum hist_column col, u16 len);
 void hists__reset_col_len(struct hists *hists);
 void hists__calc_col_len(struct hists *hists, struct hist_entry *he);
 
+void hists__match(struct hists *leader, struct hists *other);
+
 struct perf_hpp {
 	char *buf;
 	size_t size;