perf tools: Rename perf_evlist__mmap() to evlist__mmap()

[linux.git] / tools / perf / tests / mmap-basic.c

diff --git a/tools/perf/tests/mmap-basic.c b/tools/perf/tests/mmap-basic.c
index 0919b0793e5b681d876630ac5dc7834bed9269c6..4d42e455feb70f81777a9ca2f4f58312fb6931b6 100644 (file)
--- a/tools/perf/tests/mmap-basic.c
+++ b/tools/perf/tests/mmap-basic.c
@@ -3,14 +3,18 @@
 #include <inttypes.h>
 /* For the CLR_() macros */
 #include <pthread.h>
+#include <stdlib.h>
+#include <perf/cpumap.h>
 
+#include "debug.h"
 #include "evlist.h"
 #include "evsel.h"
 #include "thread_map.h"
-#include "cpumap.h"
 #include "tests.h"
 #include <linux/err.h>
 #include <linux/kernel.h>
+#include <linux/string.h>
+#include <perf/evlist.h>
 
 /*
  * This test will generate random numbers of calls to some getpid syscalls,
@@ -27,18 +31,18 @@ int test__basic_mmap(struct test *test __maybe_unused, int subtest __maybe_unuse
 {
        int err = -1;
        union perf_event *event;
-       struct thread_map *threads;
-       struct cpu_map *cpus;
-       struct perf_evlist *evlist;
+       struct perf_thread_map *threads;
+       struct perf_cpu_map *cpus;
+       struct evlist *evlist;
        cpu_set_t cpu_set;
        const char *syscall_names[] = { "getsid", "getppid", "getpgid", };
        pid_t (*syscalls[])(void) = { (void *)getsid, getppid, (void*)getpgid };
 #define nsyscalls ARRAY_SIZE(syscall_names)
        unsigned int nr_events[nsyscalls],
                     expected_nr_events[nsyscalls], i, j;
-       struct perf_evsel *evsels[nsyscalls], *evsel;
+       struct evsel *evsels[nsyscalls], *evsel;
        char sbuf[STRERR_BUFSIZE];
-       struct perf_mmap *md;
+       struct mmap *md;
 
        threads = thread_map__new(-1, getpid(), UINT_MAX);
        if (threads == NULL) {
@@ -46,9 +50,9 @@ int test__basic_mmap(struct test *test __maybe_unused, int subtest __maybe_unuse
                return -1;
        }
 
-       cpus = cpu_map__new(NULL);
+       cpus = perf_cpu_map__new(NULL);
        if (cpus == NULL) {
-               pr_debug("cpu_map__new\n");
+               pr_debug("perf_cpu_map__new\n");
                goto out_free_threads;
        }
 
@@ -61,13 +65,13 @@ int test__basic_mmap(struct test *test __maybe_unused, int subtest __maybe_unuse
                goto out_free_cpus;
        }
 
-       evlist = perf_evlist__new();
+       evlist = evlist__new();
        if (evlist == NULL) {
                pr_debug("perf_evlist__new\n");
                goto out_free_cpus;
        }
 
-       perf_evlist__set_maps(evlist, cpus, threads);
+       perf_evlist__set_maps(&evlist->core, cpus, threads);
 
        for (i = 0; i < nsyscalls; ++i) {
                char name[64];
@@ -79,12 +83,12 @@ int test__basic_mmap(struct test *test __maybe_unused, int subtest __maybe_unuse
                        goto out_delete_evlist;
                }
 
-               evsels[i]->attr.wakeup_events = 1;
+               evsels[i]->core.attr.wakeup_events = 1;
                perf_evsel__set_sample_id(evsels[i], false);
 
-               perf_evlist__add(evlist, evsels[i]);
+               evlist__add(evlist, evsels[i]);
 
-               if (perf_evsel__open(evsels[i], cpus, threads) < 0) {
+               if (evsel__open(evsels[i], cpus, threads) < 0) {
                        pr_debug("failed to open counter: %s, "
                                 "tweak /proc/sys/kernel/perf_event_paranoid?\n",
                                 str_error_r(errno, sbuf, sizeof(sbuf)));
@@ -95,7 +99,7 @@ int test__basic_mmap(struct test *test __maybe_unused, int subtest __maybe_unuse
                expected_nr_events[i] = 1 + rand() % 127;
        }
 
-       if (perf_evlist__mmap(evlist, 128) < 0) {
+       if (evlist__mmap(evlist, 128) < 0) {
                pr_debug("failed to mmap events: %d (%s)\n", errno,
                         str_error_r(errno, sbuf, sizeof(sbuf)));
                goto out_delete_evlist;
@@ -151,12 +155,12 @@ int test__basic_mmap(struct test *test __maybe_unused, int subtest __maybe_unuse
        }
 
 out_delete_evlist:
-       perf_evlist__delete(evlist);
+       evlist__delete(evlist);
        cpus    = NULL;
        threads = NULL;
 out_free_cpus:
-       cpu_map__put(cpus);
+       perf_cpu_map__put(cpus);
 out_free_threads:
-       thread_map__put(threads);
+       perf_thread_map__put(threads);
        return err;
 }