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 c6d3f4488b735868ce40b6eedca0555d78485a74..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
 
@@ -39,7 +42,7 @@ static int __test__sw_clock_freq(enum perf_sw_ids clock_id)
        };
        struct perf_cpu_map *cpus;
        struct perf_thread_map *threads;
-       struct perf_mmap *md;
+       struct mmap *md;
 
        attr.sample_freq = 500;
 
@@ -64,7 +67,7 @@ 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;
@@ -79,7 +82,7 @@ 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)));
@@ -125,8 +128,8 @@ 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:
        evlist__delete(evlist);
        return err;