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>

diff --git a/tools/perf/builtin-diff.c b/tools/perf/builtin-diff.c
index 5cb577a3c5b2d0604a32f22d71972cfd3cb680ea..413c65a1ba391bbb6d757372756c7e6864b921eb 100644 (file)
--- a/tools/perf/builtin-diff.c
+++ b/tools/perf/builtin-diff.c
@@ -214,8 +214,7 @@ static int __cmd_diff(void)
                first = false;
 
                hists__match(&evsel_old->hists, &evsel->hists);
-               hists__fprintf(&evsel->hists, &evsel_old->hists,
-                              true, 0, 0, stdout);
+               hists__fprintf(&evsel->hists, true, 0, 0, stdout);
        }
 
 out_delete:

diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c
index 6748cac919d10526503ed9efdd108d7474bb6163..95e7ea879b8a4f32bd52b7bcc3b295220e0a6510 100644 (file)
--- 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, true, 0, 0, stdout);
+               hists__fprintf(hists, true, 0, 0, stdout);
                fprintf(stdout, "\n\n");
        }
 

diff --git a/tools/perf/builtin-top.c b/tools/perf/builtin-top.c
index 357115874b770e917dd97d9cc8eb14c40a623ba9..ff6db8086805e68caa29e2b232ae0d271dc7b47a 100644 (file)
--- 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,
+       hists__fprintf(&top->sym_evsel->hists, 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 532a60177c32a28e533f8b0c76df082d496eed32..6b0138e5f3321c11a438bd37ac60aec816d458fb 100644 (file)
--- 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 0aa6776caba57db50a87c44925b909dc32b3799b..1340c93aa619de22abb3ee84b8b084b0c27013e8 100644 (file)
--- 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)

diff --git a/tools/perf/util/hist.h b/tools/perf/util/hist.h
index b1a2b9d9b6585c4b40aee010180eb492cd918221..b83a2268b5d28e0ed7d48a1c1e84995ae9c1065d 100644 (file)
--- a/tools/perf/util/hist.h
+++ b/tools/perf/util/hist.h
@@ -98,8 +98,8 @@ void hists__output_recalc_col_len(struct hists *hists, int max_rows);
 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_header, int max_rows, int max_cols, FILE *fp);
+size_t hists__fprintf(struct hists *self, 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);