perf tools: Removing hists pair argument from output path

The hists pointer is now part of the 'struct hist_entry'.

And since the overhead and baseline columns are split now, there's no
reason to pass it through the output path.

Signed-off-by: Jiri Olsa <jolsa@redhat.com>
Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/r/1349354994-17853-5-git-send-email-namhyung@kernel.org
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

2 files changed, 8 insertions, 11 deletions

diff --git a/tools/perf/ui/hist.c b/tools/perf/ui/hist.c
index 532a60177c3..6b0138e5f33 100644
--- a/tools/perf/ui/hist.c
+++ b/tools/perf/ui/hist.c
@@ -228,16 +228,17 @@ 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;
         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->period / old_total;
 
         new_total = hpp->total_period;
         if (new_total > 0)
diff --git a/tools/perf/ui/stdio/hist.c b/tools/perf/ui/stdio/hist.c
index 0aa6776caba..1340c93aa61 100644
--- a/tools/perf/ui/stdio/hist.c
+++ b/tools/perf/ui/stdio/hist.c
@@ -307,8 +307,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,
-                               u64 total_period, FILE *fp)
+                               struct hists *hists, u64 total_period, FILE *fp)
 {
         char bf[512];
         int ret;
@@ -316,7 +315,6 @@ static int hist_entry__fprintf(struct hist_entry *he, size_t size,
                 .buf            = bf,
                 .size           = size,
                 .total_period   = total_period,
-                .ptr            = pair_hists,
         };
         bool color = !symbol_conf.field_sep;
 
@@ -335,8 +333,7 @@ static int hist_entry__fprintf(struct hist_entry *he, size_t size,
         return ret;
 }
 
-size_t hists__fprintf(struct hists *hists, struct hists *pair,
-                      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;
@@ -351,7 +348,6 @@ 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;
 
@@ -453,7 +449,7 @@ print_entries:
                 if (h->filtered)
                         continue;
 
-                ret += hist_entry__fprintf(h, max_cols, hists, pair,
+                ret += hist_entry__fprintf(h, max_cols, hists,
                                            total_period, fp);
 
                 if (max_rows && ++nr_rows >= max_rows)