perf diff: Switching the base hists to be pairs head

Making the baseline hists to act as a pairs head.

So far we don't care which hists act as a pairs head, because we have
only 2 files to deal with and any of them is suitable to do the job.

But if we want to process more files, we need to pick up one hists to
act as pairs head, and the baseline hists is the most suitable.

Signed-off-by: Jiri Olsa <jolsa@redhat.com>
Reviewed-by: Namhyung Kim <namhyung@kernel.org>
Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/n/tip-cklmt2o4j87i9viz900245ae@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

1 files changed, 5 insertions, 20 deletions

diff --git a/tools/perf/ui/hist.c b/tools/perf/ui/hist.c
index f45c97f694da..02313a9c4682 100644
--- a/tools/perf/ui/hist.c
+++ b/tools/perf/ui/hist.c
@@ -178,18 +178,8 @@ static int hpp__width_baseline(struct perf_hpp_fmt *fmt __maybe_unused,
 
 static double baseline_percent(struct hist_entry *he)
 {
-        struct hist_entry *pair = hist_entry__next_pair(he);
-        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;
+        struct hists *hists = he->hists;
+        return 100.0 * he->stat.period / hists->stats.total_period;
 }
 
 static int hpp__color_baseline(struct perf_hpp_fmt *fmt __maybe_unused,
@@ -197,10 +187,8 @@ static int hpp__color_baseline(struct perf_hpp_fmt *fmt __maybe_unused,
 {
         double percent = baseline_percent(he);
 
-        if (hist_entry__has_pairs(he) || symbol_conf.field_sep)
-                return percent_color_snprintf(hpp->buf, hpp->size, " %6.2f%%", percent);
-        else
-                return scnprintf(hpp->buf, hpp->size, "        ");
+        return percent_color_snprintf(hpp->buf, hpp->size, " %6.2f%%",
+                                      percent);
 }
 
 static int hpp__entry_baseline(struct perf_hpp_fmt *_fmt __maybe_unused,
@@ -209,10 +197,7 @@ static int hpp__entry_baseline(struct perf_hpp_fmt *_fmt __maybe_unused,
         double percent = baseline_percent(he);
         const char *fmt = symbol_conf.field_sep ? "%.2f" : " %6.2f%%";
 
-        if (hist_entry__has_pairs(he) || symbol_conf.field_sep)
-                return scnprintf(hpp->buf, hpp->size, fmt, percent);
-        else
-                return scnprintf(hpp->buf, hpp->size, "            ");
+        return scnprintf(hpp->buf, hpp->size, fmt, percent);
 }
 
 static int hpp__header_period_baseline(struct perf_hpp_fmt *_fmt __maybe_unused,