7 files changed, 44 insertions, 40 deletions

diff --git a/tools/perf/builtin-diff.c b/tools/perf/builtin-diff.c
index 761f4197a9e2..5cb577a3c5b2 100644
--- a/tools/perf/builtin-diff.c
+++ b/tools/perf/builtin-diff.c
@@ -70,8 +70,8 @@ static struct perf_tool tool = {
         .ordering_requires_timestamps = true,
 };
 
-static void perf_session__insert_hist_entry_by_name(struct rb_root *root,
-                                                    struct hist_entry *he)
+static void insert_hist_entry_by_name(struct rb_root *root,
+                                      struct hist_entry *he)
 {
         struct rb_node **p = &root->rb_node;
         struct rb_node *parent = NULL;
@@ -90,7 +90,7 @@ static void perf_session__insert_hist_entry_by_name(struct rb_root *root,
         rb_insert_color(&he->rb_node, root);
 }
 
-static void hists__resort_entries(struct hists *self)
+static void hists__name_resort(struct hists *self, bool sort)
 {
         unsigned long position = 1;
         struct rb_root tmp = RB_ROOT;
@@ -100,12 +100,16 @@ static void hists__resort_entries(struct hists *self)
                 struct hist_entry *n = rb_entry(next, struct hist_entry, rb_node);
 
                 next = rb_next(&n->rb_node);
-                rb_erase(&n->rb_node, &self->entries);
                 n->position = position++;
-                perf_session__insert_hist_entry_by_name(&tmp, n);
+
+                if (sort) {
+                        rb_erase(&n->rb_node, &self->entries);
+                        insert_hist_entry_by_name(&tmp, n);
+                }
         }
 
-        self->entries = tmp;
+        if (sort)
+                self->entries = tmp;
 }
 
 static struct hist_entry *hists__find_entry(struct hists *self,
@@ -121,7 +125,7 @@ static struct hist_entry *hists__find_entry(struct hists *self,
                         n = n->rb_left;
                 else if (cmp > 0)
                         n = n->rb_right;
-                else 
+                else
                         return iter;
         }
 
@@ -150,6 +154,24 @@ static struct perf_evsel *evsel_match(struct perf_evsel *evsel,
         return NULL;
 }
 
+static void perf_evlist__resort_hists(struct perf_evlist *evlist, bool name)
+{
+        struct perf_evsel *evsel;
+
+        list_for_each_entry(evsel, &evlist->entries, node) {
+                struct hists *hists = &evsel->hists;
+
+                hists__output_resort(hists);
+
+                /*
+                 * The hists__name_resort only sets possition
+                 * if name is false.
+                 */
+                if (name || ((!name) && show_displacement))
+                        hists__name_resort(hists, name);
+        }
+}
+
 static int __cmd_diff(void)
 {
         int ret, i;
@@ -176,15 +198,8 @@ static int __cmd_diff(void)
         evlist_old = older->evlist;
         evlist_new = newer->evlist;
 
-        list_for_each_entry(evsel, &evlist_new->entries, node)
-                hists__output_resort(&evsel->hists);
-
-        list_for_each_entry(evsel, &evlist_old->entries, node) {
-                hists__output_resort(&evsel->hists);
-
-                if (show_displacement)
-                        hists__resort_entries(&evsel->hists);
-        }
+        perf_evlist__resort_hists(evlist_old, true);
+        perf_evlist__resort_hists(evlist_new, false);
 
         list_for_each_entry(evsel, &evlist_new->entries, node) {
                 struct perf_evsel *evsel_old;
@@ -200,7 +215,7 @@ static int __cmd_diff(void)
 
                 hists__match(&evsel_old->hists, &evsel->hists);
                 hists__fprintf(&evsel->hists, &evsel_old->hists,
-                               show_displacement, true, 0, 0, stdout);
+                               true, 0, 0, stdout);
         }
 
 out_delete:
diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c
index 1da243dfbc3e..6748cac919d1 100644
--- a/tools/perf/builtin-report.c
+++ b/tools/perf/builtin-report.c
@@ -320,7 +320,7 @@ static int perf_evlist__tty_browse_hists(struct perf_evlist *evlist,
                 const char *evname = perf_evsel__name(pos);
 
                 hists__fprintf_nr_sample_events(hists, evname, stdout);
-                hists__fprintf(hists, NULL, false, true, 0, 0, stdout);
+                hists__fprintf(hists, NULL, true, 0, 0, stdout);
                 fprintf(stdout, "\n\n");
         }
 
diff --git a/tools/perf/builtin-top.c b/tools/perf/builtin-top.c
index f0c1c4f4692d..357115874b77 100644
--- a/tools/perf/builtin-top.c
+++ b/tools/perf/builtin-top.c
@@ -316,7 +316,7 @@ static void perf_top__print_sym_table(struct perf_top *top)
         hists__output_recalc_col_len(&top->sym_evsel->hists,
                                      top->winsize.ws_row - 3);
         putchar('\n');
-        hists__fprintf(&top->sym_evsel->hists, NULL, false, false,
+        hists__fprintf(&top->sym_evsel->hists, NULL, false,
                        top->winsize.ws_row - 4 - printed, win_width, stdout);
 }
 
diff --git a/tools/perf/ui/hist.c b/tools/perf/ui/hist.c
index e3f8cd46e7d7..55b9ca8f084c 100644
--- a/tools/perf/ui/hist.c
+++ b/tools/perf/ui/hist.c
@@ -244,13 +244,15 @@ static int hpp__width_displ(struct perf_hpp *hpp __maybe_unused)
 }
 
 static int hpp__entry_displ(struct perf_hpp *hpp,
-                            struct hist_entry *he __maybe_unused)
+                            struct hist_entry *he)
 {
+        struct hist_entry *pair = he->pair;
+        long displacement = pair ? pair->position - he->position : 0;
         const char *fmt = symbol_conf.field_sep ? "%s" : "%6.6s";
         char buf[32] = " ";
 
-        if (hpp->displacement)
-                scnprintf(buf, sizeof(buf), "%+4ld", hpp->displacement);
+        if (displacement)
+                scnprintf(buf, sizeof(buf), "%+4ld", displacement);
 
         return scnprintf(hpp->buf, hpp->size, fmt, buf);
 }
diff --git a/tools/perf/ui/stdio/hist.c b/tools/perf/ui/stdio/hist.c
index 882461a42830..d7405f064e88 100644
--- a/tools/perf/ui/stdio/hist.c
+++ b/tools/perf/ui/stdio/hist.c
@@ -308,7 +308,7 @@ static size_t hist_entry__callchain_fprintf(struct hist_entry *he,
 
 static int hist_entry__fprintf(struct hist_entry *he, size_t size,
                                struct hists *hists, struct hists *pair_hists,
-                               long displacement, u64 total_period, FILE *fp)
+                               u64 total_period, FILE *fp)
 {
         char bf[512];
         int ret;
@@ -316,7 +316,6 @@ static int hist_entry__fprintf(struct hist_entry *he, size_t size,
                 .buf            = bf,
                 .size           = size,
                 .total_period   = total_period,
-                .displacement   = displacement,
                 .ptr            = pair_hists,
         };
         bool color = !symbol_conf.field_sep;
@@ -337,15 +336,13 @@ static int hist_entry__fprintf(struct hist_entry *he, size_t size,
 }
 
 size_t hists__fprintf(struct hists *hists, struct hists *pair,
-                      bool show_displacement, bool show_header, int max_rows,
+                      bool show_header, int max_rows,
                       int max_cols, FILE *fp)
 {
         struct sort_entry *se;
         struct rb_node *nd;
         size_t ret = 0;
         u64 total_period;
-        unsigned long position = 1;
-        long displacement = 0;
         unsigned int width;
         const char *sep = symbol_conf.field_sep;
         const char *col_width = symbol_conf.col_width_list_str;
@@ -449,15 +446,7 @@ print_entries:
                 if (h->filtered)
                         continue;
 
-                if (show_displacement) {
-                        if (h->pair != NULL)
-                                displacement = ((long)h->pair->position -
-                                                (long)position);
-                        else
-                                displacement = 0;
-                        ++position;
-                }
-                ret += hist_entry__fprintf(h, max_cols, hists, pair, displacement,
+                ret += hist_entry__fprintf(h, max_cols, hists, pair,
                                            total_period, fp);
 
                 if (max_rows && ++nr_rows >= max_rows)
diff --git a/tools/perf/util/hist.h b/tools/perf/util/hist.h
index 6ca74079d5c9..efb8fc8a4d24 100644
--- a/tools/perf/util/hist.h
+++ b/tools/perf/util/hist.h
@@ -99,8 +99,7 @@ void hists__inc_nr_events(struct hists *self, u32 type);
 size_t hists__fprintf_nr_events(struct hists *self, FILE *fp);
 
 size_t hists__fprintf(struct hists *self, struct hists *pair,
-                      bool show_displacement, bool show_header,
-                      int max_rows, int max_cols, FILE *fp);
+                      bool show_header, int max_rows, int max_cols, FILE *fp);
 
 int hist_entry__inc_addr_samples(struct hist_entry *self, int evidx, u64 addr);
 int hist_entry__annotate(struct hist_entry *self, size_t privsize);
@@ -120,7 +119,6 @@ struct perf_hpp {
         size_t size;
         u64 total_period;
         const char *sep;
-        long displacement;
         void *ptr;
 };
 
diff --git a/tools/perf/util/sort.h b/tools/perf/util/sort.h
index eb3959b8e9d9..f070b523c81a 100644
--- a/tools/perf/util/sort.h
+++ b/tools/perf/util/sort.h
@@ -73,8 +73,8 @@ struct hist_entry {
         u8                      filtered;
         char                    *srcline;
         struct symbol           *parent;
+        unsigned long           position;
         union {
-                unsigned long     position;
                 struct hist_entry *pair;
                 struct rb_root    sorted_chain;
         };