perf evlist: Use the right prefix for 'struct evlist' create maps 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/builtin-ftrace.c b/tools/perf/builtin-ftrace.c
index bf4d8e9..d49448a 100644 (file)
--- a/tools/perf/builtin-ftrace.c
+++ b/tools/perf/builtin-ftrace.c
@@ -957,7 +957,7 @@ int cmd_ftrace(int argc, const char **argv)
                goto out_delete_filters;
        }
 
-       ret = perf_evlist__create_maps(ftrace.evlist, &ftrace.target);
+       ret = evlist__create_maps(ftrace.evlist, &ftrace.target);
        if (ret < 0)
                goto out_delete_evlist;
 

diff --git a/tools/perf/builtin-kvm.c b/tools/perf/builtin-kvm.c
index e1b60aa..7560d6b 100644 (file)
--- a/tools/perf/builtin-kvm.c
+++ b/tools/perf/builtin-kvm.c
@@ -1442,7 +1442,7 @@ static int kvm_events_live(struct perf_kvm_stat *kvm,
                goto out;
        }
 
-       if (perf_evlist__create_maps(kvm->evlist, &kvm->opts.target) < 0)
+       if (evlist__create_maps(kvm->evlist, &kvm->opts.target) < 0)
                usage_with_options(live_usage, live_options);
 
        /*

diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c
index 2d74a41..e956348 100644 (file)
--- a/tools/perf/builtin-record.c
+++ b/tools/perf/builtin-record.c
@@ -2792,7 +2792,7 @@ int cmd_record(int argc, const char **argv)
        rec->opts.ignore_missing_thread = rec->opts.target.uid != UINT_MAX || rec->opts.target.pid;
 
        err = -ENOMEM;
-       if (perf_evlist__create_maps(rec->evlist, &rec->opts.target) < 0)
+       if (evlist__create_maps(rec->evlist, &rec->opts.target) < 0)
                usage_with_options(record_usage, record_options);
 
        err = auxtrace_record__options(rec->itr, rec->evlist, &rec->opts);

diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c
index d69378f..1e967c3 100644 (file)
--- a/tools/perf/builtin-stat.c
+++ b/tools/perf/builtin-stat.c
@@ -2249,7 +2249,7 @@ int cmd_stat(int argc, const char **argv)
        if ((stat_config.aggr_mode == AGGR_THREAD) && (target.system_wide))
                target.per_thread = true;
 
-       if (perf_evlist__create_maps(evsel_list, &target) < 0) {
+       if (evlist__create_maps(evsel_list, &target) < 0) {
                if (target__has_task(&target)) {
                        pr_err("Problems finding threads of monitor\n");
                        parse_options_usage(stat_usage, stat_options, "p", 1);

diff --git a/tools/perf/builtin-top.c b/tools/perf/builtin-top.c
index 5601a35..51600f6 100644 (file)
--- a/tools/perf/builtin-top.c
+++ b/tools/perf/builtin-top.c
@@ -1694,7 +1694,7 @@ int cmd_top(int argc, const char **argv)
        if (target__none(target))
                target->system_wide = true;
 
-       if (perf_evlist__create_maps(top.evlist, target) < 0) {
+       if (evlist__create_maps(top.evlist, target) < 0) {
                ui__error("Couldn't create thread/CPU maps: %s\n",
                          errno == ENOENT ? "No such process" : str_error_r(errno, errbuf, sizeof(errbuf)));
                goto out_delete_evlist;

diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c
index a463ce8..ebf4fe9 100644 (file)
--- a/tools/perf/builtin-trace.c
+++ b/tools/perf/builtin-trace.c
@@ -3950,7 +3950,7 @@ static int trace__run(struct trace *trace, int argc, const char **argv)
        if (trace->cgroup)
                evlist__set_default_cgroup(trace->evlist, trace->cgroup);
 
-       err = perf_evlist__create_maps(evlist, &trace->opts.target);
+       err = evlist__create_maps(evlist, &trace->opts.target);
        if (err < 0) {
                fprintf(trace->output, "Problems parsing the target to trace, check your options!\n");
                goto out_delete_evlist;

diff --git a/tools/perf/tests/backward-ring-buffer.c b/tools/perf/tests/backward-ring-buffer.c
index 15cea51..f00f7f3 100644 (file)
--- a/tools/perf/tests/backward-ring-buffer.c
+++ b/tools/perf/tests/backward-ring-buffer.c
@@ -109,7 +109,7 @@ int test__backward_ring_buffer(struct test *test __maybe_unused, int subtest __m
                return TEST_FAIL;
        }
 
-       err = perf_evlist__create_maps(evlist, &opts.target);
+       err = evlist__create_maps(evlist, &opts.target);
        if (err < 0) {
                pr_debug("Not enough memory to create thread/cpu maps\n");
                goto out_delete_evlist;

diff --git a/tools/perf/tests/bpf.c b/tools/perf/tests/bpf.c
index 7ed284a..d4b232f 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),
                return TEST_FAIL;
        }
 
-       err = perf_evlist__create_maps(evlist, &opts.target);
+       err = evlist__create_maps(evlist, &opts.target);
        if (err < 0) {
                pr_debug("Not enough memory to create thread/cpu maps\n");
                goto out_delete_evlist;

diff --git a/tools/perf/tests/event-times.c b/tools/perf/tests/event-times.c
index 9da2d4f..04ce440 100644 (file)
--- a/tools/perf/tests/event-times.c
+++ b/tools/perf/tests/event-times.c
@@ -26,7 +26,7 @@ static int attach__enable_on_exec(struct evlist *evlist)
 
        pr_debug("attaching to spawned child, enable on exec\n");
 
-       err = perf_evlist__create_maps(evlist, &target);
+       err = evlist__create_maps(evlist, &target);
        if (err < 0) {
                pr_debug("Not enough memory to create thread/cpu maps\n");
                return err;

diff --git a/tools/perf/tests/openat-syscall-tp-fields.c b/tools/perf/tests/openat-syscall-tp-fields.c
index 1f5f5e7..78367b1 100644 (file)
--- a/tools/perf/tests/openat-syscall-tp-fields.c
+++ b/tools/perf/tests/openat-syscall-tp-fields.c
@@ -54,9 +54,9 @@ int test__syscall_openat_tp_fields(struct test *test __maybe_unused, int subtest
 
        evlist__add(evlist, evsel);
 
-       err = perf_evlist__create_maps(evlist, &opts.target);
+       err = evlist__create_maps(evlist, &opts.target);
        if (err < 0) {
-               pr_debug("%s: perf_evlist__create_maps\n", __func__);
+               pr_debug("%s: evlist__create_maps\n", __func__);
                goto out_delete_evlist;
        }
 

diff --git a/tools/perf/tests/perf-record.c b/tools/perf/tests/perf-record.c
index f0b2066..01c9282 100644 (file)
--- a/tools/perf/tests/perf-record.c
+++ b/tools/perf/tests/perf-record.c
@@ -84,7 +84,7 @@ int test__PERF_RECORD(struct test *test __maybe_unused, int subtest __maybe_unus
         * evlist__prepare_workload we'll fill in the only thread
         * we're monitoring, the one forked there.
         */
-       err = perf_evlist__create_maps(evlist, &opts.target);
+       err = evlist__create_maps(evlist, &opts.target);
        if (err < 0) {
                pr_debug("Not enough memory to create thread/cpu maps\n");
                goto out_delete_evlist;

diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c
index 28b4d34..e68e5a4 100644 (file)
--- a/tools/perf/util/evlist.c
+++ b/tools/perf/util/evlist.c
@@ -892,7 +892,7 @@ int evlist__mmap(struct evlist *evlist, unsigned int pages)
        return evlist__mmap_ex(evlist, pages, 0, false, 0, PERF_AFFINITY_SYS, 1, 0);
 }
 
-int perf_evlist__create_maps(struct evlist *evlist, struct target *target)
+int evlist__create_maps(struct evlist *evlist, struct target *target)
 {
        bool all_threads = (target->per_thread && target->system_wide);
        struct perf_cpu_map *cpus;
@@ -1223,7 +1223,7 @@ void evlist__close(struct evlist *evlist)
        }
 }
 
-static int perf_evlist__create_syswide_maps(struct evlist *evlist)
+static int evlist__create_syswide_maps(struct evlist *evlist)
 {
        struct perf_cpu_map *cpus;
        struct perf_thread_map *threads;
@@ -1265,7 +1265,7 @@ int evlist__open(struct evlist *evlist)
         * as sys_perf_event_open(cpu = -1, thread = -1) is EINVAL
         */
        if (evlist->core.threads == NULL && evlist->core.cpus == NULL) {
-               err = perf_evlist__create_syswide_maps(evlist);
+               err = evlist__create_syswide_maps(evlist);
                if (err < 0)
                        goto out_err;
        }

diff --git a/tools/perf/util/evlist.h b/tools/perf/util/evlist.h
index 8d3fdea..3b3bf3d 100644 (file)
--- a/tools/perf/util/evlist.h
+++ b/tools/perf/util/evlist.h
@@ -195,7 +195,7 @@ int evlist__enable_event_idx(struct evlist *evlist, struct evsel *evsel, int idx
 void perf_evlist__set_selected(struct evlist *evlist,
                               struct evsel *evsel);
 
-int perf_evlist__create_maps(struct evlist *evlist, struct target *target);
+int evlist__create_maps(struct evlist *evlist, struct target *target);
 int evlist__apply_filters(struct evlist *evlist, struct evsel **err_evsel);
 
 void __evlist__set_leader(struct list_head *list);

diff --git a/tools/perf/util/sideband_evlist.c b/tools/perf/util/sideband_evlist.c
index 13f387b..748371a 100644 (file)
--- a/tools/perf/util/sideband_evlist.c
+++ b/tools/perf/util/sideband_evlist.c
@@ -101,7 +101,7 @@ int evlist__start_sb_thread(struct evlist *evlist, struct target *target)
        if (!evlist)
                return 0;
 
-       if (perf_evlist__create_maps(evlist, target))
+       if (evlist__create_maps(evlist, target))
                goto out_delete_evlist;
 
        if (evlist->core.nr_entries > 1) {