perf evlist: Use the right prefix for 'struct evlist' methods: evlist__set_leader()

perf_evlist__ is for 'struct perf_evlist' methods, in tools/lib/perf/,
go on completing this split.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Ian Rogers <irogers@google.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c
index f15b2f8aa14d8bdd466db1d781f1845adf9cf001..2dcfd6d3f879a61b09f6c3b177068a47d3d6336a 100644 (file)
--- a/tools/perf/builtin-stat.c
+++ b/tools/perf/builtin-stat.c
@@ -733,7 +733,7 @@ static int __run_perf_stat(int argc, const char **argv, int run_idx)
        }
 
        if (group)
-               perf_evlist__set_leader(evsel_list);
+               evlist__set_leader(evsel_list);
 
        if (affinity__setup(&affinity) < 0)
                return -1;

diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c
index 8bdf3d2c907cbe119000fe8b34e768b6a6debb97..655691eebe8516127c42b3987edc8c38e8e5e9ce 100644 (file)
--- a/tools/perf/util/evlist.c
+++ b/tools/perf/util/evlist.c
@@ -212,7 +212,7 @@ out:
        return err;
 }
 
-void __perf_evlist__set_leader(struct list_head *list)
+void __evlist__set_leader(struct list_head *list)
 {
        struct evsel *evsel, *leader;
 
@@ -226,11 +226,11 @@ void __perf_evlist__set_leader(struct list_head *list)
        }
 }
 
-void perf_evlist__set_leader(struct evlist *evlist)
+void evlist__set_leader(struct evlist *evlist)
 {
        if (evlist->core.nr_entries) {
                evlist->nr_groups = evlist->core.nr_entries > 1 ? 1 : 0;
-               __perf_evlist__set_leader(&evlist->core.entries);
+               __evlist__set_leader(&evlist->core.entries);
        }
 }
 
@@ -1694,7 +1694,7 @@ void perf_evlist__force_leader(struct evlist *evlist)
        if (!evlist->nr_groups) {
                struct evsel *leader = evlist__first(evlist);
 
-               perf_evlist__set_leader(evlist);
+               evlist__set_leader(evlist);
                leader->forced_leader = true;
        }
 }

diff --git a/tools/perf/util/evlist.h b/tools/perf/util/evlist.h
index e1a450322bc5bcb61cd99b0052c73cbc8b69df03..c155f13640775b1a53c931061f39197895b0d37e 100644 (file)
--- a/tools/perf/util/evlist.h
+++ b/tools/perf/util/evlist.h
@@ -220,8 +220,8 @@ void perf_evlist__set_selected(struct evlist *evlist,
 int perf_evlist__create_maps(struct evlist *evlist, struct target *target);
 int perf_evlist__apply_filters(struct evlist *evlist, struct evsel **err_evsel);
 
-void __perf_evlist__set_leader(struct list_head *list);
-void perf_evlist__set_leader(struct evlist *evlist);
+void __evlist__set_leader(struct list_head *list);
+void evlist__set_leader(struct evlist *evlist);
 
 u64 __evlist__combined_sample_type(struct evlist *evlist);
 u64 evlist__combined_sample_type(struct evlist *evlist);

diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c
index 3b581d7b3213109edf7bba578166264577359574..8fa87f60133ffe05060c7a788d75c28ee141927f 100644 (file)
--- a/tools/perf/util/parse-events.c
+++ b/tools/perf/util/parse-events.c
@@ -1769,7 +1769,7 @@ void parse_events__set_leader(char *name, struct list_head *list,
        if (parse_events__set_leader_for_uncore_aliase(name, list, parse_state))
                return;
 
-       __perf_evlist__set_leader(list);
+       __evlist__set_leader(list);
        leader = list_entry(list->next, struct evsel, core.node);
        leader->group_name = name ? strdup(name) : NULL;
 }

diff --git a/tools/perf/util/python.c b/tools/perf/util/python.c
index ae8edde7c50efbf5007fe6f656973dd6a499a7c1..3d3b4651486307a932cf85c7e15e1d2c70dbe836 100644 (file)
--- a/tools/perf/util/python.c
+++ b/tools/perf/util/python.c
@@ -1089,7 +1089,7 @@ static PyObject *pyrf_evlist__open(struct pyrf_evlist *pevlist,
                return NULL;
 
        if (group)
-               perf_evlist__set_leader(evlist);
+               evlist__set_leader(evlist);
 
        if (evlist__open(evlist) < 0) {
                PyErr_SetFromErrno(PyExc_OSError);

diff --git a/tools/perf/util/record.c b/tools/perf/util/record.c
index 07e4b96a6625a697023b2b4b37dcd42494cc7748..7330407db4ba1f2c55f43646e7b4854c59694f52 100644 (file)
--- a/tools/perf/util/record.c
+++ b/tools/perf/util/record.c
@@ -102,7 +102,7 @@ void perf_evlist__config(struct evlist *evlist, struct record_opts *opts,
         * since some might depend on this info.
         */
        if (opts->group)
-               perf_evlist__set_leader(evlist);
+               evlist__set_leader(evlist);
 
        if (evlist->core.cpus->map[0] < 0)
                opts->no_inherit = true;