perf tools: Rename perf_evlist__mmap() to evlist__mmap()

[linux.git] / tools / perf / tests / sw-clock.c

diff --git a/tools/perf/tests/sw-clock.c b/tools/perf/tests/sw-clock.c
index f9490b23789321cdbb38486b1182baa4a7ea7d9d..fbff60815be85b11ede60b91172401b850073f31 100644 (file)
--- a/tools/perf/tests/sw-clock.c
+++ b/tools/perf/tests/sw-clock.c
@@ -5,12 +5,15 @@
 #include <stdlib.h>
 #include <signal.h>
 #include <sys/mman.h>
+#include <linux/string.h>
 
 #include "tests.h"
+#include "util/debug.h"
 #include "util/evsel.h"
 #include "util/evlist.h"
 #include "util/cpumap.h"
 #include "util/thread_map.h"
+#include <perf/evlist.h>
 
 #define NR_LOOPS  10000000
 
@@ -27,8 +30,8 @@ static int __test__sw_clock_freq(enum perf_sw_ids clock_id)
        int nr_samples = 0;
        char sbuf[STRERR_BUFSIZE];
        union perf_event *event;
-       struct perf_evsel *evsel;
-       struct perf_evlist *evlist;
+       struct evsel *evsel;
+       struct evlist *evlist;
        struct perf_event_attr attr = {
                .type = PERF_TYPE_SOFTWARE,
                .config = clock_id,
@@ -37,26 +40,26 @@ static int __test__sw_clock_freq(enum perf_sw_ids clock_id)
                .disabled = 1,
                .freq = 1,
        };
-       struct cpu_map *cpus;
-       struct thread_map *threads;
-       struct perf_mmap *md;
+       struct perf_cpu_map *cpus;
+       struct perf_thread_map *threads;
+       struct mmap *md;
 
        attr.sample_freq = 500;
 
-       evlist = perf_evlist__new();
+       evlist = evlist__new();
        if (evlist == NULL) {
-               pr_debug("perf_evlist__new\n");
+               pr_debug("evlist__new\n");
                return -1;
        }
 
-       evsel = perf_evsel__new(&attr);
+       evsel = evsel__new(&attr);
        if (evsel == NULL) {
                pr_debug("perf_evsel__new\n");
                goto out_delete_evlist;
        }
-       perf_evlist__add(evlist, evsel);
+       evlist__add(evlist, evsel);
 
-       cpus = cpu_map__dummy_new();
+       cpus = perf_cpu_map__dummy_new();
        threads = thread_map__new_by_tid(getpid());
        if (!cpus || !threads) {
                err = -ENOMEM;
@@ -64,12 +67,12 @@ static int __test__sw_clock_freq(enum perf_sw_ids clock_id)
                goto out_free_maps;
        }
 
-       perf_evlist__set_maps(evlist, cpus, threads);
+       perf_evlist__set_maps(&evlist->core, cpus, threads);
 
        cpus    = NULL;
        threads = NULL;
 
-       if (perf_evlist__open(evlist)) {
+       if (evlist__open(evlist)) {
                const char *knob = "/proc/sys/kernel/perf_event_max_sample_rate";
 
                err = -errno;
@@ -79,20 +82,20 @@ static int __test__sw_clock_freq(enum perf_sw_ids clock_id)
                goto out_delete_evlist;
        }
 
-       err = perf_evlist__mmap(evlist, 128);
+       err = evlist__mmap(evlist, 128);
        if (err < 0) {
                pr_debug("failed to mmap event: %d (%s)\n", errno,
                         str_error_r(errno, sbuf, sizeof(sbuf)));
                goto out_delete_evlist;
        }
 
-       perf_evlist__enable(evlist);
+       evlist__enable(evlist);
 
        /* collect samples */
        for (i = 0; i < NR_LOOPS; i++)
                tmp++;
 
-       perf_evlist__disable(evlist);
+       evlist__disable(evlist);
 
        md = &evlist->mmap[0];
        if (perf_mmap__read_init(md) < 0)
@@ -125,10 +128,10 @@ static int __test__sw_clock_freq(enum perf_sw_ids clock_id)
        }
 
 out_free_maps:
-       cpu_map__put(cpus);
-       thread_map__put(threads);
+       perf_cpu_map__put(cpus);
+       perf_thread_map__put(threads);
 out_delete_evlist:
-       perf_evlist__delete(evlist);
+       evlist__delete(evlist);
        return err;
 }