libperf: Move 'nr_groups' from tools/perf to evlist::nr_groups

Move evsel::nr_groups to perf_evsel::nr_groups, so we can move the group
interface to libperf.

Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Requested-by: Shunsuke Nakamura <nakamura.shun@fujitsu.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Ian Rogers <irogers@google.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Michael Petlan <mpetlan@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lore.kernel.org/lkml/20210706151704.73662-5-jolsa@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/lib/perf/include/internal/evlist.h b/tools/lib/perf/include/internal/evlist.h
index 212c290..f16fa98 100644 (file)
--- a/tools/lib/perf/include/internal/evlist.h
+++ b/tools/lib/perf/include/internal/evlist.h
@@ -16,6 +16,7 @@ struct perf_mmap_param;
 struct perf_evlist {
        struct list_head         entries;
        int                      nr_entries;
+       int                      nr_groups;
        bool                     has_user_cpus;
        struct perf_cpu_map     *cpus;
        struct perf_cpu_map     *all_cpus;

diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c
index 6a8cc19..ee2a5ca 100644 (file)
--- a/tools/perf/builtin-record.c
+++ b/tools/perf/builtin-record.c
@@ -1776,7 +1776,7 @@ static int __cmd_record(struct record *rec, int argc, const char **argv)
                rec->tool.ordered_events = false;
        }
 
-       if (!rec->evlist->nr_groups)
+       if (!rec->evlist->core.nr_groups)
                perf_header__clear_feat(&session->header, HEADER_GROUP_DESC);
 
        if (data->is_pipe) {

diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c
index d3a1a66..6386af6 100644 (file)
--- a/tools/perf/builtin-report.c
+++ b/tools/perf/builtin-report.c
@@ -1432,7 +1432,7 @@ repeat:
 
        setup_forced_leader(&report, session->evlist);
 
-       if (symbol_conf.group_sort_idx && !session->evlist->nr_groups) {
+       if (symbol_conf.group_sort_idx && !session->evlist->core.nr_groups) {
                parse_options_usage(NULL, options, "group-sort-idx", 0);
                ret = -EINVAL;
                goto error;

diff --git a/tools/perf/tests/bpf.c b/tools/perf/tests/bpf.c
index c72adbd..33bda9c 100644 (file)
--- a/tools/perf/tests/bpf.c
+++ b/tools/perf/tests/bpf.c
@@ -151,7 +151,7 @@ static int do_test(struct bpf_object *obj, int (*func)(void),
        }
 
        evlist__splice_list_tail(evlist, &parse_state.list);
-       evlist->nr_groups = parse_state.nr_groups;
+       evlist->core.nr_groups = parse_state.nr_groups;
 
        evlist__config(evlist, &opts, NULL);
 

diff --git a/tools/perf/tests/parse-events.c b/tools/perf/tests/parse-events.c
index a28688b..56a7b6a 100644 (file)
--- a/tools/perf/tests/parse-events.c
+++ b/tools/perf/tests/parse-events.c
@@ -49,7 +49,7 @@ static int test__checkevent_tracepoint(struct evlist *evlist)
        struct evsel *evsel = evlist__first(evlist);
 
        TEST_ASSERT_VAL("wrong number of entries", 1 == evlist->core.nr_entries);
-       TEST_ASSERT_VAL("wrong number of groups", 0 == evlist->nr_groups);
+       TEST_ASSERT_VAL("wrong number of groups", 0 == evlist->core.nr_groups);
        TEST_ASSERT_VAL("wrong type", PERF_TYPE_TRACEPOINT == evsel->core.attr.type);
        TEST_ASSERT_VAL("wrong sample_type",
                PERF_TP_SAMPLE_TYPE == evsel->core.attr.sample_type);
@@ -62,7 +62,7 @@ static int test__checkevent_tracepoint_multi(struct evlist *evlist)
        struct evsel *evsel;
 
        TEST_ASSERT_VAL("wrong number of entries", evlist->core.nr_entries > 1);
-       TEST_ASSERT_VAL("wrong number of groups", 0 == evlist->nr_groups);
+       TEST_ASSERT_VAL("wrong number of groups", 0 == evlist->core.nr_groups);
 
        evlist__for_each_entry(evlist, evsel) {
                TEST_ASSERT_VAL("wrong type",
@@ -668,7 +668,7 @@ static int test__group1(struct evlist *evlist)
        struct evsel *evsel, *leader;
 
        TEST_ASSERT_VAL("wrong number of entries", 2 == evlist->core.nr_entries);
-       TEST_ASSERT_VAL("wrong number of groups", 1 == evlist->nr_groups);
+       TEST_ASSERT_VAL("wrong number of groups", 1 == evlist->core.nr_groups);
 
        /* instructions:k */
        evsel = leader = evlist__first(evlist);
@@ -710,7 +710,7 @@ static int test__group2(struct evlist *evlist)
        struct evsel *evsel, *leader;
 
        TEST_ASSERT_VAL("wrong number of entries", 3 == evlist->core.nr_entries);
-       TEST_ASSERT_VAL("wrong number of groups", 1 == evlist->nr_groups);
+       TEST_ASSERT_VAL("wrong number of groups", 1 == evlist->core.nr_groups);
 
        /* faults + :ku modifier */
        evsel = leader = evlist__first(evlist);
@@ -765,7 +765,7 @@ static int test__group3(struct evlist *evlist __maybe_unused)
        struct evsel *evsel, *leader;
 
        TEST_ASSERT_VAL("wrong number of entries", 5 == evlist->core.nr_entries);
-       TEST_ASSERT_VAL("wrong number of groups", 2 == evlist->nr_groups);
+       TEST_ASSERT_VAL("wrong number of groups", 2 == evlist->core.nr_groups);
 
        /* group1 syscalls:sys_enter_openat:H */
        evsel = leader = evlist__first(evlist);
@@ -857,7 +857,7 @@ static int test__group4(struct evlist *evlist __maybe_unused)
        struct evsel *evsel, *leader;
 
        TEST_ASSERT_VAL("wrong number of entries", 2 == evlist->core.nr_entries);
-       TEST_ASSERT_VAL("wrong number of groups", 1 == evlist->nr_groups);
+       TEST_ASSERT_VAL("wrong number of groups", 1 == evlist->core.nr_groups);
 
        /* cycles:u + p */
        evsel = leader = evlist__first(evlist);
@@ -901,7 +901,7 @@ static int test__group5(struct evlist *evlist __maybe_unused)
        struct evsel *evsel, *leader;
 
        TEST_ASSERT_VAL("wrong number of entries", 5 == evlist->core.nr_entries);
-       TEST_ASSERT_VAL("wrong number of groups", 2 == evlist->nr_groups);
+       TEST_ASSERT_VAL("wrong number of groups", 2 == evlist->core.nr_groups);
 
        /* cycles + G */
        evsel = leader = evlist__first(evlist);
@@ -987,7 +987,7 @@ static int test__group_gh1(struct evlist *evlist)
        struct evsel *evsel, *leader;
 
        TEST_ASSERT_VAL("wrong number of entries", 2 == evlist->core.nr_entries);
-       TEST_ASSERT_VAL("wrong number of groups", 1 == evlist->nr_groups);
+       TEST_ASSERT_VAL("wrong number of groups", 1 == evlist->core.nr_groups);
 
        /* cycles + :H group modifier */
        evsel = leader = evlist__first(evlist);
@@ -1027,7 +1027,7 @@ static int test__group_gh2(struct evlist *evlist)
        struct evsel *evsel, *leader;
 
        TEST_ASSERT_VAL("wrong number of entries", 2 == evlist->core.nr_entries);
-       TEST_ASSERT_VAL("wrong number of groups", 1 == evlist->nr_groups);
+       TEST_ASSERT_VAL("wrong number of groups", 1 == evlist->core.nr_groups);
 
        /* cycles + :G group modifier */
        evsel = leader = evlist__first(evlist);
@@ -1067,7 +1067,7 @@ static int test__group_gh3(struct evlist *evlist)
        struct evsel *evsel, *leader;
 
        TEST_ASSERT_VAL("wrong number of entries", 2 == evlist->core.nr_entries);
-       TEST_ASSERT_VAL("wrong number of groups", 1 == evlist->nr_groups);
+       TEST_ASSERT_VAL("wrong number of groups", 1 == evlist->core.nr_groups);
 
        /* cycles:G + :u group modifier */
        evsel = leader = evlist__first(evlist);
@@ -1107,7 +1107,7 @@ static int test__group_gh4(struct evlist *evlist)
        struct evsel *evsel, *leader;
 
        TEST_ASSERT_VAL("wrong number of entries", 2 == evlist->core.nr_entries);
-       TEST_ASSERT_VAL("wrong number of groups", 1 == evlist->nr_groups);
+       TEST_ASSERT_VAL("wrong number of groups", 1 == evlist->core.nr_groups);
 
        /* cycles:G + :uG group modifier */
        evsel = leader = evlist__first(evlist);

diff --git a/tools/perf/tests/pfm.c b/tools/perf/tests/pfm.c
index acd5094..e8fd0da 100644 (file)
--- a/tools/perf/tests/pfm.c
+++ b/tools/perf/tests/pfm.c
@@ -96,7 +96,7 @@ static int test__pfm_events(void)
                                count_pfm_events(&evlist->core),
                                table[i].nr_events);
                TEST_ASSERT_EQUAL(table[i].events,
-                               evlist->nr_groups,
+                               evlist->core.nr_groups,
                                0);
 
                evlist__delete(evlist);
@@ -180,7 +180,7 @@ static int test__pfm_group(void)
                                count_pfm_events(&evlist->core),
                                table[i].nr_events);
                TEST_ASSERT_EQUAL(table[i].events,
-                               evlist->nr_groups,
+                               evlist->core.nr_groups,
                                table[i].nr_groups);
 
                evlist__delete(evlist);

diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c
index 9cb6638..752f64a 100644 (file)
--- a/tools/perf/util/evlist.c
+++ b/tools/perf/util/evlist.c
@@ -240,7 +240,7 @@ void __evlist__set_leader(struct list_head *list)
 void evlist__set_leader(struct evlist *evlist)
 {
        if (evlist->core.nr_entries) {
-               evlist->nr_groups = evlist->core.nr_entries > 1 ? 1 : 0;
+               evlist->core.nr_groups = evlist->core.nr_entries > 1 ? 1 : 0;
                __evlist__set_leader(&evlist->core.entries);
        }
 }
@@ -1748,7 +1748,7 @@ bool evlist__exclude_kernel(struct evlist *evlist)
  */
 void evlist__force_leader(struct evlist *evlist)
 {
-       if (!evlist->nr_groups) {
+       if (!evlist->core.nr_groups) {
                struct evsel *leader = evlist__first(evlist);
 
                evlist__set_leader(evlist);

diff --git a/tools/perf/util/evlist.h b/tools/perf/util/evlist.h
index 2073cfa..cb2bf5f 100644 (file)
--- a/tools/perf/util/evlist.h
+++ b/tools/perf/util/evlist.h
@@ -50,7 +50,6 @@ enum bkw_mmap_state {
 
 struct evlist {
        struct perf_evlist core;
-       int              nr_groups;
        bool             enabled;
        int              id_pos;
        int              is_pos;

diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c
index a105654..4424902 100644 (file)
--- a/tools/perf/util/header.c
+++ b/tools/perf/util/header.c
@@ -778,7 +778,7 @@ static int write_pmu_mappings(struct feat_fd *ff,
 static int write_group_desc(struct feat_fd *ff,
                            struct evlist *evlist)
 {
-       u32 nr_groups = evlist->nr_groups;
+       u32 nr_groups = evlist->core.nr_groups;
        struct evsel *evsel;
        int ret;
 
@@ -2735,7 +2735,7 @@ static int process_group_desc(struct feat_fd *ff, void *data __maybe_unused)
         * Rebuild group relationship based on the group_desc
         */
        session = container_of(ff->ph, struct perf_session, header);
-       session->evlist->nr_groups = nr_groups;
+       session->evlist->core.nr_groups = nr_groups;
 
        i = nr = 0;
        evlist__for_each_entry(session->evlist, evsel) {

diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c
index 6fb1830..f6d77cb 100644 (file)
--- a/tools/perf/util/parse-events.c
+++ b/tools/perf/util/parse-events.c
@@ -2285,7 +2285,7 @@ int __parse_events(struct evlist *evlist, const char *str,
        if (!ret) {
                struct evsel *last;
 
-               evlist->nr_groups += parse_state.nr_groups;
+               evlist->core.nr_groups += parse_state.nr_groups;
                last = evlist__last(evlist);
                last->cmdline_group_boundary = true;
 

diff --git a/tools/perf/util/pfm.c b/tools/perf/util/pfm.c
index 6eef6df..dd9ed56 100644 (file)
--- a/tools/perf/util/pfm.c
+++ b/tools/perf/util/pfm.c
@@ -110,7 +110,7 @@ int parse_libpfm_events_option(const struct option *opt, const char *str,
                                   "cannot close a non-existing event group\n");
                                goto error;
                        }
-                       evlist->nr_groups++;
+                       evlist->core.nr_groups++;
                        grp_leader = NULL;
                        grp_evt = -1;
                }