perf evlist: Use the right prefix for 'struct evlist' enable event methods

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/util/auxtrace.c b/tools/perf/util/auxtrace.c
index b538b9093567c6901037ed14783bc303abe436e6..8c94e21db2aa76d452795640d17bc66aa9d2d27b 100644 (file)
--- a/tools/perf/util/auxtrace.c
+++ b/tools/perf/util/auxtrace.c
@@ -658,8 +658,7 @@ int auxtrace_record__read_finish(struct auxtrace_record *itr, int idx)
                if (evsel->core.attr.type == itr->pmu->type) {
                        if (evsel->disabled)
                                return 0;
-                       return perf_evlist__enable_event_idx(itr->evlist, evsel,
-                                                            idx);
+                       return evlist__enable_event_idx(itr->evlist, evsel, idx);
                }
        }
        return -EINVAL;

diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c
index 26c436abac77d95db0ce7e07a6bdbd16a5b184dd..1c7b6d4a76bea5e35e92f23125211746b6b436d3 100644 (file)
--- a/tools/perf/util/evlist.c
+++ b/tools/perf/util/evlist.c
@@ -448,8 +448,7 @@ void evlist__toggle_enable(struct evlist *evlist)
        (evlist->enabled ? evlist__disable : evlist__enable)(evlist);
 }
 
-static int perf_evlist__enable_event_cpu(struct evlist *evlist,
-                                        struct evsel *evsel, int cpu)
+static int evlist__enable_event_cpu(struct evlist *evlist, struct evsel *evsel, int cpu)
 {
        int thread;
        int nr_threads = perf_evlist__nr_threads(evlist, evsel);
@@ -465,9 +464,7 @@ static int perf_evlist__enable_event_cpu(struct evlist *evlist,
        return 0;
 }
 
-static int perf_evlist__enable_event_thread(struct evlist *evlist,
-                                           struct evsel *evsel,
-                                           int thread)
+static int evlist__enable_event_thread(struct evlist *evlist, struct evsel *evsel, int thread)
 {
        int cpu;
        int nr_cpus = perf_cpu_map__nr(evlist->core.cpus);
@@ -483,15 +480,14 @@ static int perf_evlist__enable_event_thread(struct evlist *evlist,
        return 0;
 }
 
-int perf_evlist__enable_event_idx(struct evlist *evlist,
-                                 struct evsel *evsel, int idx)
+int evlist__enable_event_idx(struct evlist *evlist, struct evsel *evsel, int idx)
 {
        bool per_cpu_mmaps = !perf_cpu_map__empty(evlist->core.cpus);
 
        if (per_cpu_mmaps)
-               return perf_evlist__enable_event_cpu(evlist, evsel, idx);
-       else
-               return perf_evlist__enable_event_thread(evlist, evsel, idx);
+               return evlist__enable_event_cpu(evlist, evsel, idx);
+
+       return evlist__enable_event_thread(evlist, evsel, idx);
 }
 
 int evlist__add_pollfd(struct evlist *evlist, int fd)

diff --git a/tools/perf/util/evlist.h b/tools/perf/util/evlist.h
index 85da0c443ae61b8d51092cbd338a15e43a934ecf..f563e546b0553c603b1605a8f98928b3e38f806b 100644 (file)
--- a/tools/perf/util/evlist.h
+++ b/tools/perf/util/evlist.h
@@ -190,8 +190,7 @@ void evlist__disable(struct evlist *evlist);
 void evlist__enable(struct evlist *evlist);
 void evlist__toggle_enable(struct evlist *evlist);
 
-int perf_evlist__enable_event_idx(struct evlist *evlist,
-                                 struct evsel *evsel, int idx);
+int evlist__enable_event_idx(struct evlist *evlist, struct evsel *evsel, int idx);
 
 void perf_evlist__set_selected(struct evlist *evlist,
                               struct evsel *evsel);