perf evlist: Use the right prefix for alternative 'struct evlist' constructors

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/arch/x86/tests/intel-cqm.c b/tools/perf/arch/x86/tests/intel-cqm.c
index 3ec562a..27dd8cf 100644 (file)
--- a/tools/perf/arch/x86/tests/intel-cqm.c
+++ b/tools/perf/arch/x86/tests/intel-cqm.c
@@ -52,7 +52,7 @@ int test__intel_cqm_count_nmi_context(struct test *test __maybe_unused, int subt
 
        evlist = evlist__new();
        if (!evlist) {
-               pr_debug("perf_evlist__new failed\n");
+               pr_debug("evlist__new failed\n");
                return TEST_FAIL;
        }
 

diff --git a/tools/perf/tests/bpf.c b/tools/perf/tests/bpf.c
index d4b232f..22d7f56 100644 (file)
--- a/tools/perf/tests/bpf.c
+++ b/tools/perf/tests/bpf.c
@@ -144,7 +144,7 @@ static int do_test(struct bpf_object *obj, int (*func)(void),
        pid[sizeof(pid) - 1] = '\0';
        opts.target.tid = opts.target.pid = pid;
 
-       /* Instead of perf_evlist__new_default, don't add default events */
+       /* Instead of evlist__new_default, don't add default events */
        evlist = evlist__new();
        if (!evlist) {
                pr_debug("Not enough memory to create evlist\n");

diff --git a/tools/perf/tests/code-reading.c b/tools/perf/tests/code-reading.c
index 339d432..0c494aa 100644 (file)
--- a/tools/perf/tests/code-reading.c
+++ b/tools/perf/tests/code-reading.c
@@ -637,7 +637,7 @@ static int do_test_code_reading(bool try_kcore)
 
                evlist = evlist__new();
                if (!evlist) {
-                       pr_debug("perf_evlist__new failed\n");
+                       pr_debug("evlist__new failed\n");
                        goto out_put;
                }
 

diff --git a/tools/perf/tests/event_update.c b/tools/perf/tests/event_update.c
index bdcf032..6562181 100644 (file)
--- a/tools/perf/tests/event_update.c
+++ b/tools/perf/tests/event_update.c
@@ -85,11 +85,10 @@ static int process_event_cpus(struct perf_tool *tool __maybe_unused,
 
 int test__event_update(struct test *test __maybe_unused, int subtest __maybe_unused)
 {
-       struct evlist *evlist;
        struct evsel *evsel;
        struct event_name tmp;
+       struct evlist *evlist = evlist__new_default();
 
-       evlist = perf_evlist__new_default();
        TEST_ASSERT_VAL("failed to get evlist", evlist);
 
        evsel = evlist__first(evlist);

diff --git a/tools/perf/tests/expand-cgroup.c b/tools/perf/tests/expand-cgroup.c
index e8187f3..0e46aeb 100644 (file)
--- a/tools/perf/tests/expand-cgroup.c
+++ b/tools/perf/tests/expand-cgroup.c
@@ -100,10 +100,9 @@ out:       for (i = 0; i < nr_events; i++)
 static int expand_default_events(void)
 {
        int ret;
-       struct evlist *evlist;
        struct rblist metric_events;
+       struct evlist *evlist = evlist__new_default();
 
-       evlist = perf_evlist__new_default();
        TEST_ASSERT_VAL("failed to get evlist", evlist);
 
        rblist__init(&metric_events);

diff --git a/tools/perf/tests/mmap-basic.c b/tools/perf/tests/mmap-basic.c
index c01d7e1..57093ae 100644 (file)
--- a/tools/perf/tests/mmap-basic.c
+++ b/tools/perf/tests/mmap-basic.c
@@ -69,7 +69,7 @@ int test__basic_mmap(struct test *test __maybe_unused, int subtest __maybe_unuse
 
        evlist = evlist__new();
        if (evlist == NULL) {
-               pr_debug("perf_evlist__new\n");
+               pr_debug("evlist__new\n");
                goto out_free_cpus;
        }
 

diff --git a/tools/perf/tests/openat-syscall-tp-fields.c b/tools/perf/tests/openat-syscall-tp-fields.c
index 78367b1..5e4af2f 100644 (file)
--- a/tools/perf/tests/openat-syscall-tp-fields.c
+++ b/tools/perf/tests/openat-syscall-tp-fields.c
@@ -42,7 +42,7 @@ int test__syscall_openat_tp_fields(struct test *test __maybe_unused, int subtest
        char sbuf[STRERR_BUFSIZE];
 
        if (evlist == NULL) {
-               pr_debug("%s: perf_evlist__new\n", __func__);
+               pr_debug("%s: evlist__new\n", __func__);
                goto out;
        }
 

diff --git a/tools/perf/tests/perf-record.c b/tools/perf/tests/perf-record.c
index 01c9282..61d1ff3 100644 (file)
--- a/tools/perf/tests/perf-record.c
+++ b/tools/perf/tests/perf-record.c
@@ -53,7 +53,7 @@ int test__PERF_RECORD(struct test *test __maybe_unused, int subtest __maybe_unus
        };
        cpu_set_t cpu_mask;
        size_t cpu_mask_size = sizeof(cpu_mask);
-       struct evlist *evlist = perf_evlist__new_dummy();
+       struct evlist *evlist = evlist__new_dummy();
        struct evsel *evsel;
        struct perf_sample sample;
        const char *cmd = "sleep";
@@ -71,7 +71,7 @@ int test__PERF_RECORD(struct test *test __maybe_unused, int subtest __maybe_unus
        char sbuf[STRERR_BUFSIZE];
 
        if (evlist == NULL) /* Fallback for kernels lacking PERF_COUNT_SW_DUMMY */
-               evlist = perf_evlist__new_default();
+               evlist = evlist__new_default();
 
        if (evlist == NULL) {
                pr_debug("Not enough memory to create evlist\n");

diff --git a/tools/perf/tests/task-exit.c b/tools/perf/tests/task-exit.c
index 452d510..bbf94e4 100644 (file)
--- a/tools/perf/tests/task-exit.c
+++ b/tools/perf/tests/task-exit.c
@@ -58,9 +58,9 @@ int test__task_exit(struct test *test __maybe_unused, int subtest __maybe_unused
 
        signal(SIGCHLD, sig_handler);
 
-       evlist = perf_evlist__new_default();
+       evlist = evlist__new_default();
        if (evlist == NULL) {
-               pr_debug("perf_evlist__new_default\n");
+               pr_debug("evlist__new_default\n");
                return -1;
        }
 

diff --git a/tools/perf/tests/topology.c b/tools/perf/tests/topology.c
index 22daf2b..165feed 100644 (file)
--- a/tools/perf/tests/topology.c
+++ b/tools/perf/tests/topology.c
@@ -40,7 +40,7 @@ static int session_write_header(char *path)
        session = perf_session__new(&data, false, NULL);
        TEST_ASSERT_VAL("can't get session", !IS_ERR(session));
 
-       session->evlist = perf_evlist__new_default();
+       session->evlist = evlist__new_default();
        TEST_ASSERT_VAL("can't get evlist", session->evlist);
 
        perf_header__set_feat(&session->header, HEADER_CPU_TOPOLOGY);

diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c
index a11364d..70b5b6e 100644 (file)
--- a/tools/perf/util/evlist.c
+++ b/tools/perf/util/evlist.c
@@ -78,7 +78,7 @@ struct evlist *evlist__new(void)
        return evlist;
 }
 
-struct evlist *perf_evlist__new_default(void)
+struct evlist *evlist__new_default(void)
 {
        struct evlist *evlist = evlist__new();
 
@@ -90,7 +90,7 @@ struct evlist *perf_evlist__new_default(void)
        return evlist;
 }
 
-struct evlist *perf_evlist__new_dummy(void)
+struct evlist *evlist__new_dummy(void)
 {
        struct evlist *evlist = evlist__new();
 

diff --git a/tools/perf/util/evlist.h b/tools/perf/util/evlist.h
index e858a35..9e73d4a 100644 (file)
--- a/tools/perf/util/evlist.h
+++ b/tools/perf/util/evlist.h
@@ -87,8 +87,8 @@ struct evsel_str_handler {
 };
 
 struct evlist *evlist__new(void);
-struct evlist *perf_evlist__new_default(void);
-struct evlist *perf_evlist__new_dummy(void);
+struct evlist *evlist__new_default(void);
+struct evlist *evlist__new_dummy(void);
 void evlist__init(struct evlist *evlist, struct perf_cpu_map *cpus,
                  struct perf_thread_map *threads);
 void evlist__exit(struct evlist *evlist);