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>

4 files changed, 41 insertions, 33 deletions

diff --git a/tools/perf/tests/hists_cumulate.c b/tools/perf/tests/hists_cumulate.c
index 0ac240db2e24..614d5c4978ab 100644
--- a/tools/perf/tests/hists_cumulate.c
+++ b/tools/perf/tests/hists_cumulate.c
@@ -245,7 +245,7 @@ static int do_test(struct hists *hists, struct result *expected, size_t nr_expec
 static int test1(struct perf_evsel *evsel, struct machine *machine)
 {
         int err;
-        struct hists *hists = &evsel->hists;
+        struct hists *hists = evsel__hists(evsel);
         /*
          * expected output:
          *
@@ -295,7 +295,7 @@ out:
 static int test2(struct perf_evsel *evsel, struct machine *machine)
 {
         int err;
-        struct hists *hists = &evsel->hists;
+        struct hists *hists = evsel__hists(evsel);
         /*
          * expected output:
          *
@@ -442,7 +442,7 @@ out:
 static int test3(struct perf_evsel *evsel, struct machine *machine)
 {
         int err;
-        struct hists *hists = &evsel->hists;
+        struct hists *hists = evsel__hists(evsel);
         /*
          * expected output:
          *
@@ -498,7 +498,7 @@ out:
 static int test4(struct perf_evsel *evsel, struct machine *machine)
 {
         int err;
-        struct hists *hists = &evsel->hists;
+        struct hists *hists = evsel__hists(evsel);
         /*
          * expected output:
          *
diff --git a/tools/perf/tests/hists_filter.c b/tools/perf/tests/hists_filter.c
index 821f581fd930..5a31787cc6b9 100644
--- a/tools/perf/tests/hists_filter.c
+++ b/tools/perf/tests/hists_filter.c
@@ -66,11 +66,12 @@ static int add_hist_entries(struct perf_evlist *evlist,
                                 .ops = &hist_iter_normal,
                                 .hide_unresolved = false,
                         };
+                        struct hists *hists = evsel__hists(evsel);
 
                         /* make sure it has no filter at first */
-                        evsel->hists.thread_filter = NULL;
-                        evsel->hists.dso_filter = NULL;
-                        evsel->hists.symbol_filter_str = NULL;
+                        hists->thread_filter = NULL;
+                        hists->dso_filter = NULL;
+                        hists->symbol_filter_str = NULL;
 
                         sample.pid = fake_samples[i].pid;
                         sample.tid = fake_samples[i].pid;
@@ -134,7 +135,7 @@ int test__hists_filter(void)
                 goto out;
 
         evlist__for_each(evlist, evsel) {
-                struct hists *hists = &evsel->hists;
+                struct hists *hists = evsel__hists(evsel);
 
                 hists__collapse_resort(hists, NULL);
                 hists__output_resort(hists);
@@ -160,7 +161,7 @@ int test__hists_filter(void)
                                 hists->stats.total_non_filtered_period);
 
                 /* now applying thread filter for 'bash' */
-                evsel->hists.thread_filter = fake_samples[9].thread;
+                hists->thread_filter = fake_samples[9].thread;
                 hists__filter_by_thread(hists);
 
                 if (verbose > 2) {
@@ -185,11 +186,11 @@ int test__hists_filter(void)
                                 hists->stats.total_non_filtered_period == 400);
 
                 /* remove thread filter first */
-                evsel->hists.thread_filter = NULL;
+                hists->thread_filter = NULL;
                 hists__filter_by_thread(hists);
 
                 /* now applying dso filter for 'kernel' */
-                evsel->hists.dso_filter = fake_samples[0].map->dso;
+                hists->dso_filter = fake_samples[0].map->dso;
                 hists__filter_by_dso(hists);
 
                 if (verbose > 2) {
@@ -214,7 +215,7 @@ int test__hists_filter(void)
                                 hists->stats.total_non_filtered_period == 300);
 
                 /* remove dso filter first */
-                evsel->hists.dso_filter = NULL;
+                hists->dso_filter = NULL;
                 hists__filter_by_dso(hists);
 
                 /*
@@ -224,7 +225,7 @@ int test__hists_filter(void)
                  * be counted as a separate entry but the sample count and
                  * total period will be remained.
                  */
-                evsel->hists.symbol_filter_str = "main";
+                hists->symbol_filter_str = "main";
                 hists__filter_by_symbol(hists);
 
                 if (verbose > 2) {
@@ -249,8 +250,8 @@ int test__hists_filter(void)
                                 hists->stats.total_non_filtered_period == 300);
 
                 /* now applying all filters at once. */
-                evsel->hists.thread_filter = fake_samples[1].thread;
-                evsel->hists.dso_filter = fake_samples[1].map->dso;
+                hists->thread_filter = fake_samples[1].thread;
+                hists->dso_filter = fake_samples[1].map->dso;
                 hists__filter_by_thread(hists);
                 hists__filter_by_dso(hists);
 
diff --git a/tools/perf/tests/hists_link.c b/tools/perf/tests/hists_link.c
index d4b34b0f50a2..278ba8344c23 100644
--- a/tools/perf/tests/hists_link.c
+++ b/tools/perf/tests/hists_link.c
@@ -73,6 +73,8 @@ static int add_hist_entries(struct perf_evlist *evlist, struct machine *machine)
          * "bash [libc] malloc" so total 9 entries will be in the tree.
          */
         evlist__for_each(evlist, evsel) {
+                struct hists *hists = evsel__hists(evsel);
+
                 for (k = 0; k < ARRAY_SIZE(fake_common_samples); k++) {
                         const union perf_event event = {
                                 .header = {
@@ -87,7 +89,7 @@ static int add_hist_entries(struct perf_evlist *evlist, struct machine *machine)
                                                           &sample) < 0)
                                 goto out;
 
-                        he = __hists__add_entry(&evsel->hists, &al, NULL,
+                        he = __hists__add_entry(hists, &al, NULL,
                                                 NULL, NULL, 1, 1, 0, true);
                         if (he == NULL)
                                 goto out;
@@ -111,7 +113,7 @@ static int add_hist_entries(struct perf_evlist *evlist, struct machine *machine)
                                                           &sample) < 0)
                                 goto out;
 
-                        he = __hists__add_entry(&evsel->hists, &al, NULL,
+                        he = __hists__add_entry(hists, &al, NULL,
                                                 NULL, NULL, 1, 1, 0, true);
                         if (he == NULL)
                                 goto out;
@@ -271,6 +273,7 @@ static int validate_link(struct hists *leader, struct hists *other)
 int test__hists_link(void)
 {
         int err = -1;
+        struct hists *hists, *first_hists;
         struct machines machines;
         struct machine *machine = NULL;
         struct perf_evsel *evsel, *first;
@@ -306,24 +309,28 @@ int test__hists_link(void)
                 goto out;
 
         evlist__for_each(evlist, evsel) {
-                hists__collapse_resort(&evsel->hists, NULL);
+                hists = evsel__hists(evsel);
+                hists__collapse_resort(hists, NULL);
 
                 if (verbose > 2)
-                        print_hists_in(&evsel->hists);
+                        print_hists_in(hists);
         }
 
         first = perf_evlist__first(evlist);
         evsel = perf_evlist__last(evlist);
 
+        first_hists = evsel__hists(first);
+        hists = evsel__hists(evsel);
+
         /* match common entries */
-        hists__match(&first->hists, &evsel->hists);
-        err = validate_match(&first->hists, &evsel->hists);
+        hists__match(first_hists, hists);
+        err = validate_match(first_hists, hists);
         if (err)
                 goto out;
 
         /* link common and/or dummy entries */
-        hists__link(&first->hists, &evsel->hists);
-        err = validate_link(&first->hists, &evsel->hists);
+        hists__link(first_hists, hists);
+        err = validate_link(first_hists, hists);
         if (err)
                 goto out;
 
diff --git a/tools/perf/tests/hists_output.c b/tools/perf/tests/hists_output.c
index e3bbd6c54c1b..a748f2be1222 100644
--- a/tools/perf/tests/hists_output.c
+++ b/tools/perf/tests/hists_output.c
@@ -122,7 +122,7 @@ typedef int (*test_fn_t)(struct perf_evsel *, struct machine *);
 static int test1(struct perf_evsel *evsel, struct machine *machine)
 {
         int err;
-        struct hists *hists = &evsel->hists;
+        struct hists *hists = evsel__hists(evsel);
         struct hist_entry *he;
         struct rb_root *root;
         struct rb_node *node;
@@ -159,7 +159,7 @@ static int test1(struct perf_evsel *evsel, struct machine *machine)
                 print_hists_out(hists);
         }
 
-        root = &evsel->hists.entries;
+        root = &hists->entries;
         node = rb_first(root);
         he = rb_entry(node, struct hist_entry, rb_node);
         TEST_ASSERT_VAL("Invalid hist entry",
@@ -224,7 +224,7 @@ out:
 static int test2(struct perf_evsel *evsel, struct machine *machine)
 {
         int err;
-        struct hists *hists = &evsel->hists;
+        struct hists *hists = evsel__hists(evsel);
         struct hist_entry *he;
         struct rb_root *root;
         struct rb_node *node;
@@ -259,7 +259,7 @@ static int test2(struct perf_evsel *evsel, struct machine *machine)
                 print_hists_out(hists);
         }
 
-        root = &evsel->hists.entries;
+        root = &hists->entries;
         node = rb_first(root);
         he = rb_entry(node, struct hist_entry, rb_node);
         TEST_ASSERT_VAL("Invalid hist entry",
@@ -280,7 +280,7 @@ out:
 static int test3(struct perf_evsel *evsel, struct machine *machine)
 {
         int err;
-        struct hists *hists = &evsel->hists;
+        struct hists *hists = evsel__hists(evsel);
         struct hist_entry *he;
         struct rb_root *root;
         struct rb_node *node;
@@ -313,7 +313,7 @@ static int test3(struct perf_evsel *evsel, struct machine *machine)
                 print_hists_out(hists);
         }
 
-        root = &evsel->hists.entries;
+        root = &hists->entries;
         node = rb_first(root);
         he = rb_entry(node, struct hist_entry, rb_node);
         TEST_ASSERT_VAL("Invalid hist entry",
@@ -354,7 +354,7 @@ out:
 static int test4(struct perf_evsel *evsel, struct machine *machine)
 {
         int err;
-        struct hists *hists = &evsel->hists;
+        struct hists *hists = evsel__hists(evsel);
         struct hist_entry *he;
         struct rb_root *root;
         struct rb_node *node;
@@ -391,7 +391,7 @@ static int test4(struct perf_evsel *evsel, struct machine *machine)
                 print_hists_out(hists);
         }
 
-        root = &evsel->hists.entries;
+        root = &hists->entries;
         node = rb_first(root);
         he = rb_entry(node, struct hist_entry, rb_node);
         TEST_ASSERT_VAL("Invalid hist entry",
@@ -456,7 +456,7 @@ out:
 static int test5(struct perf_evsel *evsel, struct machine *machine)
 {
         int err;
-        struct hists *hists = &evsel->hists;
+        struct hists *hists = evsel__hists(evsel);
         struct hist_entry *he;
         struct rb_root *root;
         struct rb_node *node;
@@ -494,7 +494,7 @@ static int test5(struct perf_evsel *evsel, struct machine *machine)
                 print_hists_out(hists);
         }
 
-        root = &evsel->hists.entries;
+        root = &hists->entries;
         node = rb_first(root);
         he = rb_entry(node, struct hist_entry, rb_node);