7 files changed, 127 insertions, 103 deletions

diff --git a/tools/perf/ui/browsers/hists.c b/tools/perf/ui/browsers/hists.c
index a21f40bebbac..0568536ecf67 100644
--- a/tools/perf/ui/browsers/hists.c
+++ b/tools/perf/ui/browsers/hists.c
@@ -569,7 +569,8 @@ static int hist_browser__show_callchain(struct hist_browser *browser,
 static int hist_browser__hpp_color_ ## _name(struct perf_hpp *hpp,      \
                                              struct hist_entry *he)     \
 {                                                                       \
-        double percent = 100.0 * he->_field / hpp->total_period;        \
+        struct hists *hists = he->hists;                                \
+        double percent = 100.0 * he->stat._field / hists->stats.total_period; \
         *(double *)hpp->ptr = percent;                                  \
         return scnprintf(hpp->buf, hpp->size, "%6.2f%%", percent);      \
 }
@@ -584,7 +585,7 @@ HPP__COLOR_FN(overhead_guest_us, period_guest_us)
 
 void hist_browser__init_hpp(void)
 {
-        perf_hpp__init(false, false);
+        perf_hpp__init();
 
         perf_hpp__format[PERF_HPP__OVERHEAD].color =
                                 hist_browser__hpp_color_overhead;
@@ -624,7 +625,6 @@ static int hist_browser__show_entry(struct hist_browser *browser,
                 struct perf_hpp hpp = {
                         .buf            = s,
                         .size           = sizeof(s),
-                        .total_period   = browser->hists->stats.total_period,
                 };
 
                 ui_browser__gotorc(&browser->b, row, 0);
@@ -982,7 +982,7 @@ static int hist_browser__fprintf_entry(struct hist_browser *browser,
                 folded_sign = hist_entry__folded(he);
 
         hist_entry__sort_snprintf(he, s, sizeof(s), browser->hists);
-        percent = (he->period * 100.0) / browser->hists->stats.total_period;
+        percent = (he->stat.period * 100.0) / browser->hists->stats.total_period;
 
         if (symbol_conf.use_callchain)
                 printed += fprintf(fp, "%c ", folded_sign);
@@ -990,10 +990,10 @@ static int hist_browser__fprintf_entry(struct hist_browser *browser,
         printed += fprintf(fp, " %5.2f%%", percent);
 
         if (symbol_conf.show_nr_samples)
-                printed += fprintf(fp, " %11u", he->nr_events);
+                printed += fprintf(fp, " %11u", he->stat.nr_events);
 
         if (symbol_conf.show_total_period)
-                printed += fprintf(fp, " %12" PRIu64, he->period);
+                printed += fprintf(fp, " %12" PRIu64, he->stat.period);
 
         printed += fprintf(fp, "%s\n", rtrim(s));
 
diff --git a/tools/perf/ui/gtk/browser.c b/tools/perf/ui/gtk/browser.c
index 7ff99ec1d95e..4125c6284114 100644
--- a/tools/perf/ui/gtk/browser.c
+++ b/tools/perf/ui/gtk/browser.c
@@ -49,7 +49,8 @@ static const char *perf_gtk__get_percent_color(double percent)
 static int perf_gtk__hpp_color_ ## _name(struct perf_hpp *hpp,                  \
                                          struct hist_entry *he)                 \
 {                                                                               \
-        double percent = 100.0 * he->_field / hpp->total_period;                \
+        struct hists *hists = he->hists;                                        \
+        double percent = 100.0 * he->stat._field / hists->stats.total_period;   \
         const char *markup;                                                     \
         int ret = 0;                                                            \
                                                                                 \
@@ -73,7 +74,7 @@ HPP__COLOR_FN(overhead_guest_us, period_guest_us)
 
 void perf_gtk__init_hpp(void)
 {
-        perf_hpp__init(false, false);
+        perf_hpp__init();
 
         perf_hpp__format[PERF_HPP__OVERHEAD].color =
                                 perf_gtk__hpp_color_overhead;
@@ -102,7 +103,6 @@ static void perf_gtk__show_hists(GtkWidget *window, struct hists *hists)
         struct perf_hpp hpp = {
                 .buf            = s,
                 .size           = sizeof(s),
-                .total_period   = hists->stats.total_period,
         };
 
         nr_cols = 0;
diff --git a/tools/perf/ui/gtk/util.c b/tools/perf/ui/gtk/util.c
index 8aada5b3c04c..ccb046aac98b 100644
--- a/tools/perf/ui/gtk/util.c
+++ b/tools/perf/ui/gtk/util.c
@@ -116,7 +116,7 @@ struct perf_error_ops perf_gtk_eops = {
  * FIXME: Functions below should be implemented properly.
  *        For now, just add stubs for NO_NEWT=1 build.
  */
-#ifdef NO_NEWT_SUPPORT
+#ifndef NEWT_SUPPORT
 void ui_progress__update(u64 curr __maybe_unused, u64 total __maybe_unused,
                          const char *title __maybe_unused)
 {
diff --git a/tools/perf/ui/helpline.h b/tools/perf/ui/helpline.h
index 2b667ee454c3..baa28a4d16b9 100644
--- a/tools/perf/ui/helpline.h
+++ b/tools/perf/ui/helpline.h
@@ -23,25 +23,25 @@ void ui_helpline__puts(const char *msg);
 
 extern char ui_helpline__current[512];
 
-#ifdef NO_NEWT_SUPPORT
+#ifdef NEWT_SUPPORT
+extern char ui_helpline__last_msg[];
+int ui_helpline__show_help(const char *format, va_list ap);
+#else
 static inline int ui_helpline__show_help(const char *format __maybe_unused,
                                          va_list ap __maybe_unused)
 {
         return 0;
 }
-#else
-extern char ui_helpline__last_msg[];
-int ui_helpline__show_help(const char *format, va_list ap);
-#endif /* NO_NEWT_SUPPORT */
+#endif /* NEWT_SUPPORT */
 
-#ifdef NO_GTK2_SUPPORT
+#ifdef GTK2_SUPPORT
+int perf_gtk__show_helpline(const char *format, va_list ap);
+#else
 static inline int perf_gtk__show_helpline(const char *format __maybe_unused,
                                           va_list ap __maybe_unused)
 {
         return 0;
 }
-#else
-int perf_gtk__show_helpline(const char *format, va_list ap);
-#endif /* NO_GTK2_SUPPORT */
+#endif /* GTK2_SUPPORT */
 
 #endif /* _PERF_UI_HELPLINE_H_ */
diff --git a/tools/perf/ui/hist.c b/tools/perf/ui/hist.c
index e3f8cd46e7d7..f5a1e4f65263 100644
--- a/tools/perf/ui/hist.c
+++ b/tools/perf/ui/hist.c
@@ -8,9 +8,7 @@
 /* hist period print (hpp) functions */
 static int hpp__header_overhead(struct perf_hpp *hpp)
 {
-        const char *fmt = hpp->ptr ? "Baseline" : "Overhead";
-
-        return scnprintf(hpp->buf, hpp->size, fmt);
+        return scnprintf(hpp->buf, hpp->size, "Overhead");
 }
 
 static int hpp__width_overhead(struct perf_hpp *hpp __maybe_unused)
@@ -20,38 +18,18 @@ static int hpp__width_overhead(struct perf_hpp *hpp __maybe_unused)
 
 static int hpp__color_overhead(struct perf_hpp *hpp, struct hist_entry *he)
 {
-        double percent = 100.0 * he->period / hpp->total_period;
-
-        if (hpp->ptr) {
-                struct hists *old_hists = hpp->ptr;
-                u64 total_period = old_hists->stats.total_period;
-                u64 base_period = he->pair ? he->pair->period : 0;
-
-                if (total_period)
-                        percent = 100.0 * base_period / total_period;
-                else
-                        percent = 0.0;
-        }
+        struct hists *hists = he->hists;
+        double percent = 100.0 * he->stat.period / hists->stats.total_period;
 
         return percent_color_snprintf(hpp->buf, hpp->size, " %6.2f%%", percent);
 }
 
 static int hpp__entry_overhead(struct perf_hpp *hpp, struct hist_entry *he)
 {
-        double percent = 100.0 * he->period / hpp->total_period;
+        struct hists *hists = he->hists;
+        double percent = 100.0 * he->stat.period / hists->stats.total_period;
         const char *fmt = symbol_conf.field_sep ? "%.2f" : " %6.2f%%";
 
-        if (hpp->ptr) {
-                struct hists *old_hists = hpp->ptr;
-                u64 total_period = old_hists->stats.total_period;
-                u64 base_period = he->pair ? he->pair->period : 0;
-
-                if (total_period)
-                        percent = 100.0 * base_period / total_period;
-                else
-                        percent = 0.0;
-        }
-
         return scnprintf(hpp->buf, hpp->size, fmt, percent);
 }
 
@@ -69,13 +47,16 @@ static int hpp__width_overhead_sys(struct perf_hpp *hpp __maybe_unused)
 
 static int hpp__color_overhead_sys(struct perf_hpp *hpp, struct hist_entry *he)
 {
-        double percent = 100.0 * he->period_sys / hpp->total_period;
+        struct hists *hists = he->hists;
+        double percent = 100.0 * he->stat.period_sys / hists->stats.total_period;
+
         return percent_color_snprintf(hpp->buf, hpp->size, "%6.2f%%", percent);
 }
 
 static int hpp__entry_overhead_sys(struct perf_hpp *hpp, struct hist_entry *he)
 {
-        double percent = 100.0 * he->period_sys / hpp->total_period;
+        struct hists *hists = he->hists;
+        double percent = 100.0 * he->stat.period_sys / hists->stats.total_period;
         const char *fmt = symbol_conf.field_sep ? "%.2f" : "%6.2f%%";
 
         return scnprintf(hpp->buf, hpp->size, fmt, percent);
@@ -95,13 +76,16 @@ static int hpp__width_overhead_us(struct perf_hpp *hpp __maybe_unused)
 
 static int hpp__color_overhead_us(struct perf_hpp *hpp, struct hist_entry *he)
 {
-        double percent = 100.0 * he->period_us / hpp->total_period;
+        struct hists *hists = he->hists;
+        double percent = 100.0 * he->stat.period_us / hists->stats.total_period;
+
         return percent_color_snprintf(hpp->buf, hpp->size, "%6.2f%%", percent);
 }
 
 static int hpp__entry_overhead_us(struct perf_hpp *hpp, struct hist_entry *he)
 {
-        double percent = 100.0 * he->period_us / hpp->total_period;
+        struct hists *hists = he->hists;
+        double percent = 100.0 * he->stat.period_us / hists->stats.total_period;
         const char *fmt = symbol_conf.field_sep ? "%.2f" : "%6.2f%%";
 
         return scnprintf(hpp->buf, hpp->size, fmt, percent);
@@ -120,14 +104,17 @@ static int hpp__width_overhead_guest_sys(struct perf_hpp *hpp __maybe_unused)
 static int hpp__color_overhead_guest_sys(struct perf_hpp *hpp,
                                          struct hist_entry *he)
 {
-        double percent = 100.0 * he->period_guest_sys / hpp->total_period;
+        struct hists *hists = he->hists;
+        double percent = 100.0 * he->stat.period_guest_sys / hists->stats.total_period;
+
         return percent_color_snprintf(hpp->buf, hpp->size, " %6.2f%% ", percent);
 }
 
 static int hpp__entry_overhead_guest_sys(struct perf_hpp *hpp,
                                          struct hist_entry *he)
 {
-        double percent = 100.0 * he->period_guest_sys / hpp->total_period;
+        struct hists *hists = he->hists;
+        double percent = 100.0 * he->stat.period_guest_sys / hists->stats.total_period;
         const char *fmt = symbol_conf.field_sep ? "%.2f" : " %6.2f%% ";
 
         return scnprintf(hpp->buf, hpp->size, fmt, percent);
@@ -146,19 +133,63 @@ static int hpp__width_overhead_guest_us(struct perf_hpp *hpp __maybe_unused)
 static int hpp__color_overhead_guest_us(struct perf_hpp *hpp,
                                         struct hist_entry *he)
 {
-        double percent = 100.0 * he->period_guest_us / hpp->total_period;
+        struct hists *hists = he->hists;
+        double percent = 100.0 * he->stat.period_guest_us / hists->stats.total_period;
+
         return percent_color_snprintf(hpp->buf, hpp->size, " %6.2f%% ", percent);
 }
 
 static int hpp__entry_overhead_guest_us(struct perf_hpp *hpp,
                                         struct hist_entry *he)
 {
-        double percent = 100.0 * he->period_guest_us / hpp->total_period;
+        struct hists *hists = he->hists;
+        double percent = 100.0 * he->stat.period_guest_us / hists->stats.total_period;
         const char *fmt = symbol_conf.field_sep ? "%.2f" : " %6.2f%% ";
 
         return scnprintf(hpp->buf, hpp->size, fmt, percent);
 }
 
+static int hpp__header_baseline(struct perf_hpp *hpp)
+{
+        return scnprintf(hpp->buf, hpp->size, "Baseline");
+}
+
+static int hpp__width_baseline(struct perf_hpp *hpp __maybe_unused)
+{
+        return 8;
+}
+
+static double baseline_percent(struct hist_entry *he)
+{
+        struct hist_entry *pair = he->pair;
+        struct hists *pair_hists = pair ? pair->hists : NULL;
+        double percent = 0.0;
+
+        if (pair) {
+                u64 total_period = pair_hists->stats.total_period;
+                u64 base_period  = pair->stat.period;
+
+                percent = 100.0 * base_period / total_period;
+        }
+
+        return percent;
+}
+
+static int hpp__color_baseline(struct perf_hpp *hpp, struct hist_entry *he)
+{
+        double percent = baseline_percent(he);
+
+        return percent_color_snprintf(hpp->buf, hpp->size, " %6.2f%%", percent);
+}
+
+static int hpp__entry_baseline(struct perf_hpp *hpp, struct hist_entry *he)
+{
+        double percent = baseline_percent(he);
+        const char *fmt = symbol_conf.field_sep ? "%.2f" : " %6.2f%%";
+
+        return scnprintf(hpp->buf, hpp->size, fmt, percent);
+}
+
 static int hpp__header_samples(struct perf_hpp *hpp)
 {
         const char *fmt = symbol_conf.field_sep ? "%s" : "%11s";
@@ -175,7 +206,7 @@ static int hpp__entry_samples(struct perf_hpp *hpp, struct hist_entry *he)
 {
         const char *fmt = symbol_conf.field_sep ? "%" PRIu64 : "%11" PRIu64;
 
-        return scnprintf(hpp->buf, hpp->size, fmt, he->nr_events);
+        return scnprintf(hpp->buf, hpp->size, fmt, he->stat.nr_events);
 }
 
 static int hpp__header_period(struct perf_hpp *hpp)
@@ -194,7 +225,7 @@ static int hpp__entry_period(struct perf_hpp *hpp, struct hist_entry *he)
 {
         const char *fmt = symbol_conf.field_sep ? "%" PRIu64 : "%12" PRIu64;
 
-        return scnprintf(hpp->buf, hpp->size, fmt, he->period);
+        return scnprintf(hpp->buf, hpp->size, fmt, he->stat.period);
 }
 
 static int hpp__header_delta(struct perf_hpp *hpp)
@@ -211,20 +242,22 @@ static int hpp__width_delta(struct perf_hpp *hpp __maybe_unused)
 
 static int hpp__entry_delta(struct perf_hpp *hpp, struct hist_entry *he)
 {
-        struct hists *pair_hists = hpp->ptr;
+        struct hist_entry *pair = he->pair;
+        struct hists *pair_hists = pair ? pair->hists : NULL;
+        struct hists *hists = he->hists;
         u64 old_total, new_total;
         double old_percent = 0, new_percent = 0;
         double diff;
         const char *fmt = symbol_conf.field_sep ? "%s" : "%7.7s";
         char buf[32] = " ";
 
-        old_total = pair_hists->stats.total_period;
-        if (old_total > 0 && he->pair)
-                old_percent = 100.0 * he->pair->period / old_total;
+        old_total = pair_hists ? pair_hists->stats.total_period : 0;
+        if (old_total > 0 && pair)
+                old_percent = 100.0 * pair->stat.period / old_total;
 
-        new_total = hpp->total_period;
+        new_total = hists->stats.total_period;
         if (new_total > 0)
-                new_percent = 100.0 * he->period / new_total;
+                new_percent = 100.0 * he->stat.period / new_total;
 
         diff = new_percent - old_percent;
         if (fabs(diff) >= 0.01)
@@ -244,13 +277,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);
 }
@@ -267,6 +302,7 @@ static int hpp__entry_displ(struct perf_hpp *hpp,
         .entry  = hpp__entry_ ## _name
 
 struct perf_hpp_fmt perf_hpp__format[] = {
+        { .cond = false, HPP__COLOR_PRINT_FNS(baseline) },
         { .cond = true,  HPP__COLOR_PRINT_FNS(overhead) },
         { .cond = false, HPP__COLOR_PRINT_FNS(overhead_sys) },
         { .cond = false, HPP__COLOR_PRINT_FNS(overhead_us) },
@@ -281,7 +317,7 @@ struct perf_hpp_fmt perf_hpp__format[] = {
 #undef HPP__COLOR_PRINT_FNS
 #undef HPP__PRINT_FNS
 
-void perf_hpp__init(bool need_pair, bool show_displacement)
+void perf_hpp__init(void)
 {
         if (symbol_conf.show_cpu_utilization) {
                 perf_hpp__format[PERF_HPP__OVERHEAD_SYS].cond = true;
@@ -298,13 +334,12 @@ void perf_hpp__init(bool need_pair, bool show_displacement)
 
         if (symbol_conf.show_total_period)
                 perf_hpp__format[PERF_HPP__PERIOD].cond = true;
+}
 
-        if (need_pair) {
-                perf_hpp__format[PERF_HPP__DELTA].cond = true;
-
-                if (show_displacement)
-                        perf_hpp__format[PERF_HPP__DISPL].cond = true;
-        }
+void perf_hpp__column_enable(unsigned col, bool enable)
+{
+        BUG_ON(col >= PERF_HPP__MAX_INDEX);
+        perf_hpp__format[col].cond = enable;
 }
 
 static inline void advance_hpp(struct perf_hpp *hpp, int inc)
@@ -319,6 +354,7 @@ int hist_entry__period_snprintf(struct perf_hpp *hpp, struct hist_entry *he,
         const char *sep = symbol_conf.field_sep;
         char *start = hpp->buf;
         int i, ret;
+        bool first = true;
 
         if (symbol_conf.exclude_other && !he->parent)
                 return 0;
@@ -327,9 +363,10 @@ int hist_entry__period_snprintf(struct perf_hpp *hpp, struct hist_entry *he,
                 if (!perf_hpp__format[i].cond)
                         continue;
 
-                if (!sep || i > 0) {
+                if (!sep || !first) {
                         ret = scnprintf(hpp->buf, hpp->size, "%s", sep ?: "  ");
                         advance_hpp(hpp, ret);
+                        first = false;
                 }
 
                 if (color && perf_hpp__format[i].color)
diff --git a/tools/perf/ui/setup.c b/tools/perf/ui/setup.c
index bd7d460f844c..ebb4cc107876 100644
--- a/tools/perf/ui/setup.c
+++ b/tools/perf/ui/setup.c
@@ -30,7 +30,7 @@ void setup_browser(bool fallback_to_pager)
                 if (fallback_to_pager)
                         setup_pager();
 
-                perf_hpp__init(false, false);
+                perf_hpp__init();
                 break;
         }
 }
diff --git a/tools/perf/ui/stdio/hist.c b/tools/perf/ui/stdio/hist.c
index 882461a42830..fbd4e32d0743 100644
--- a/tools/perf/ui/stdio/hist.c
+++ b/tools/perf/ui/stdio/hist.c
@@ -271,7 +271,7 @@ static size_t hist_entry_callchain__fprintf(struct hist_entry *he,
 {
         switch (callchain_param.mode) {
         case CHAIN_GRAPH_REL:
-                return callchain__fprintf_graph(fp, &he->sorted_chain, he->period,
+                return callchain__fprintf_graph(fp, &he->sorted_chain, he->stat.period,
                                                 left_margin);
                 break;
         case CHAIN_GRAPH_ABS:
@@ -292,9 +292,10 @@ static size_t hist_entry_callchain__fprintf(struct hist_entry *he,
 
 static size_t hist_entry__callchain_fprintf(struct hist_entry *he,
                                             struct hists *hists,
-                                            u64 total_period, FILE *fp)
+                                            FILE *fp)
 {
         int left_margin = 0;
+        u64 total_period = hists->stats.total_period;
 
         if (sort__first_dimension == SORT_COMM) {
                 struct sort_entry *se = list_first_entry(&hist_entry__sort_list,
@@ -307,17 +308,13 @@ 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)
+                               struct hists *hists, FILE *fp)
 {
         char bf[512];
         int ret;
         struct perf_hpp hpp = {
                 .buf            = bf,
                 .size           = size,
-                .total_period   = total_period,
-                .displacement   = displacement,
-                .ptr            = pair_hists,
         };
         bool color = !symbol_conf.field_sep;
 
@@ -330,22 +327,17 @@ static int hist_entry__fprintf(struct hist_entry *he, size_t size,
         ret = fprintf(fp, "%s\n", bf);
 
         if (symbol_conf.use_callchain)
-                ret += hist_entry__callchain_fprintf(he, hists,
-                                                     total_period, fp);
+                ret += hist_entry__callchain_fprintf(he, hists, fp);
 
         return ret;
 }
 
-size_t hists__fprintf(struct hists *hists, struct hists *pair,
-                      bool show_displacement, bool show_header, int max_rows,
+size_t hists__fprintf(struct hists *hists, 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;
@@ -354,8 +346,8 @@ size_t hists__fprintf(struct hists *hists, struct hists *pair,
         struct perf_hpp dummy_hpp = {
                 .buf    = bf,
                 .size   = sizeof(bf),
-                .ptr    = pair,
         };
+        bool first = true;
 
         init_rem_hits();
 
@@ -367,8 +359,10 @@ size_t hists__fprintf(struct hists *hists, struct hists *pair,
                 if (!perf_hpp__format[idx].cond)
                         continue;
 
-                if (idx)
+                if (!first)
                         fprintf(fp, "%s", sep ?: "  ");
+                else
+                        first = false;
 
                 perf_hpp__format[idx].header(&dummy_hpp);
                 fprintf(fp, "%s", bf);
@@ -403,6 +397,8 @@ size_t hists__fprintf(struct hists *hists, struct hists *pair,
         if (sep)
                 goto print_entries;
 
+        first = true;
+
         fprintf(fp, "# ");
         for (idx = 0; idx < PERF_HPP__MAX_INDEX; idx++) {
                 unsigned int i;
@@ -410,8 +406,10 @@ size_t hists__fprintf(struct hists *hists, struct hists *pair,
                 if (!perf_hpp__format[idx].cond)
                         continue;
 
-                if (idx)
+                if (!first)
                         fprintf(fp, "%s", sep ?: "  ");
+                else
+                        first = false;
 
                 width = perf_hpp__format[idx].width(&dummy_hpp);
                 for (i = 0; i < width; i++)
@@ -441,24 +439,13 @@ size_t hists__fprintf(struct hists *hists, struct hists *pair,
                 goto out;
 
 print_entries:
-        total_period = hists->stats.total_period;
-
         for (nd = rb_first(&hists->entries); nd; nd = rb_next(nd)) {
                 struct hist_entry *h = rb_entry(nd, struct hist_entry, rb_node);
 
                 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,
-                                           total_period, fp);
+                ret += hist_entry__fprintf(h, max_cols, hists, fp);
 
                 if (max_rows && ++nr_rows >= max_rows)
                         goto out;