perf evsel: Add hists helper

Not all tools need a hists instance per perf_evsel, so lets pave the way
to remove evsel->hists while leaving a way to access the hists from a
specially allocated evsel, one that comes with space at the end where
lives the evsel.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Borislav Petkov <bp@suse.de>
Cc: David Ahern <dsahern@gmail.com>
Cc: Don Zickus <dzickus@redhat.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jean Pihet <jean.pihet@linaro.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
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/n/tip-qlktkhe31w4mgtbd84035sr2@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

14 files changed, 132 insertions, 101 deletions

diff --git a/tools/perf/builtin-annotate.c b/tools/perf/builtin-annotate.c
index be5939418425..c9a119e2113d 100644
--- a/tools/perf/builtin-annotate.c
+++ b/tools/perf/builtin-annotate.c
@@ -51,6 +51,7 @@ static int perf_evsel__add_sample(struct perf_evsel *evsel,
                                   struct addr_location *al,
                                   struct perf_annotate *ann)
 {
+        struct hists *hists = evsel__hists(evsel);
         struct hist_entry *he;
         int ret;
 
@@ -66,13 +67,12 @@ static int perf_evsel__add_sample(struct perf_evsel *evsel,
                 return 0;
         }
 
-        he = __hists__add_entry(&evsel->hists, al, NULL, NULL, NULL, 1, 1, 0,
-                                true);
+        he = __hists__add_entry(hists, al, NULL, NULL, NULL, 1, 1, 0, true);
         if (he == NULL)
                 return -ENOMEM;
 
         ret = hist_entry__inc_addr_samples(he, evsel->idx, al->addr);
-        hists__inc_nr_samples(&evsel->hists, true);
+        hists__inc_nr_samples(hists, true);
         return ret;
 }
 
@@ -225,7 +225,7 @@ static int __cmd_annotate(struct perf_annotate *ann)
 
         total_nr_samples = 0;
         evlist__for_each(session->evlist, pos) {
-                struct hists *hists = &pos->hists;
+                struct hists *hists = evsel__hists(pos);
                 u32 nr_samples = hists->stats.nr_events[PERF_RECORD_SAMPLE];
 
                 if (nr_samples > 0) {
diff --git a/tools/perf/builtin-diff.c b/tools/perf/builtin-diff.c
index a3ce19f7aebd..8c5c11ca8c53 100644
--- a/tools/perf/builtin-diff.c
+++ b/tools/perf/builtin-diff.c
@@ -327,6 +327,7 @@ static int diff__process_sample_event(struct perf_tool *tool __maybe_unused,
                                       struct machine *machine)
 {
         struct addr_location al;
+        struct hists *hists = evsel__hists(evsel);
 
         if (perf_event__preprocess_sample(event, machine, &al, sample) < 0) {
                 pr_warning("problem processing %d event, skipping it.\n",
@@ -334,7 +335,7 @@ static int diff__process_sample_event(struct perf_tool *tool __maybe_unused,
                 return -1;
         }
 
-        if (hists__add_entry(&evsel->hists, &al, sample->period,
+        if (hists__add_entry(hists, &al, sample->period,
                              sample->weight, sample->transaction)) {
                 pr_warning("problem incrementing symbol period, skipping event\n");
                 return -1;
@@ -346,9 +347,9 @@ static int diff__process_sample_event(struct perf_tool *tool __maybe_unused,
          * hists__output_resort() and precompute needs the total
          * period in order to sort entries by percentage delta.
          */
-        evsel->hists.stats.total_period += sample->period;
+        hists->stats.total_period += sample->period;
         if (!al.filtered)
-                evsel->hists.stats.total_non_filtered_period += sample->period;
+                hists->stats.total_non_filtered_period += sample->period;
 
         return 0;
 }
@@ -382,7 +383,7 @@ static void perf_evlist__collapse_resort(struct perf_evlist *evlist)
         struct perf_evsel *evsel;
 
         evlist__for_each(evlist, evsel) {
-                struct hists *hists = &evsel->hists;
+                struct hists *hists = evsel__hists(evsel);
 
                 hists__collapse_resort(hists, NULL);
         }
@@ -631,24 +632,26 @@ static void data_process(void)
         bool first = true;
 
         evlist__for_each(evlist_base, evsel_base) {
+                struct hists *hists_base = evsel__hists(evsel_base);
                 struct data__file *d;
                 int i;
 
                 data__for_each_file_new(i, d) {
                         struct perf_evlist *evlist = d->session->evlist;
                         struct perf_evsel *evsel;
+                        struct hists *hists;
 
                         evsel = evsel_match(evsel_base, evlist);
                         if (!evsel)
                                 continue;
 
-                        d->hists = &evsel->hists;
+                        hists = evsel__hists(evsel);
+                        d->hists = hists;
 
-                        hists__match(&evsel_base->hists, &evsel->hists);
+                        hists__match(hists_base, hists);
 
                         if (!show_baseline_only)
-                                hists__link(&evsel_base->hists,
-                                            &evsel->hists);
+                                hists__link(hists_base, hists);
                 }
 
                 fprintf(stdout, "%s# Event '%s'\n#\n", first ? "" : "\n",
@@ -659,7 +662,7 @@ static void data_process(void)
                 if (verbose || data__files_cnt > 2)
                         data__fprintf();
 
-                hists__process(&evsel_base->hists);
+                hists__process(hists_base);
         }
 }
 
diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c
index ac145fae0521..3750d635f0f7 100644
--- a/tools/perf/builtin-report.c
+++ b/tools/perf/builtin-report.c
@@ -288,12 +288,14 @@ static size_t hists__fprintf_nr_sample_events(struct hists *hists, struct report
                 evname = buf;
 
                 for_each_group_member(pos, evsel) {
+                        const struct hists *pos_hists = evsel__hists(pos);
+
                         if (symbol_conf.filter_relative) {
-                                nr_samples += pos->hists.stats.nr_non_filtered_samples;
-                                nr_events += pos->hists.stats.total_non_filtered_period;
+                                nr_samples += pos_hists->stats.nr_non_filtered_samples;
+                                nr_events += pos_hists->stats.total_non_filtered_period;
                         } else {
-                                nr_samples += pos->hists.stats.nr_events[PERF_RECORD_SAMPLE];
-                                nr_events += pos->hists.stats.total_period;
+                                nr_samples += pos_hists->stats.nr_events[PERF_RECORD_SAMPLE];
+                                nr_events += pos_hists->stats.total_period;
                         }
                 }
         }
@@ -318,7 +320,7 @@ static int perf_evlist__tty_browse_hists(struct perf_evlist *evlist,
         struct perf_evsel *pos;
 
         evlist__for_each(evlist, pos) {
-                struct hists *hists = &pos->hists;
+                struct hists *hists = evsel__hists(pos);
                 const char *evname = perf_evsel__name(pos);