perf tools: Rename perf_evlist__mmap() to evlist__mmap()

[linux.git] / tools / perf / tests / task-exit.c

diff --git a/tools/perf/tests/task-exit.c b/tools/perf/tests/task-exit.c
index c094fb8cc8776d95a42ff8e1cf0b93d9ee638b10..718838b5e7249cc8eedee604c91b186b0d10ff58 100644 (file)
--- a/tools/perf/tests/task-exit.c
+++ b/tools/perf/tests/task-exit.c
@@ -1,12 +1,16 @@
 // SPDX-License-Identifier: GPL-2.0
+#include "debug.h"
 #include "evlist.h"
 #include "evsel.h"
+#include "target.h"
 #include "thread_map.h"
-#include "cpumap.h"
 #include "tests.h"
 
 #include <errno.h>
 #include <signal.h>
+#include <linux/string.h>
+#include <perf/cpumap.h>
+#include <perf/evlist.h>
 
 static int exited;
 static int nr_exit;
@@ -47,7 +51,7 @@ int test__task_exit(struct test *test __maybe_unused, int subtest __maybe_unused
        char sbuf[STRERR_BUFSIZE];
        struct perf_cpu_map *cpus;
        struct perf_thread_map *threads;
-       struct perf_mmap *md;
+       struct mmap *md;
 
        signal(SIGCHLD, sig_handler);
 
@@ -71,7 +75,7 @@ int test__task_exit(struct test *test __maybe_unused, int subtest __maybe_unused
                goto out_free_maps;
        }
 
-       perf_evlist__set_maps(evlist, cpus, threads);
+       perf_evlist__set_maps(&evlist->core, cpus, threads);
 
        cpus    = NULL;
        threads = NULL;
@@ -84,16 +88,16 @@ int test__task_exit(struct test *test __maybe_unused, int subtest __maybe_unused
        }
 
        evsel = perf_evlist__first(evlist);
-       evsel->attr.task = 1;
+       evsel->core.attr.task = 1;
 #ifdef __s390x__
-       evsel->attr.sample_freq = 1000000;
+       evsel->core.attr.sample_freq = 1000000;
 #else
-       evsel->attr.sample_freq = 1;
+       evsel->core.attr.sample_freq = 1;
 #endif
-       evsel->attr.inherit = 0;
-       evsel->attr.watermark = 0;
-       evsel->attr.wakeup_events = 1;
-       evsel->attr.exclude_kernel = 1;
+       evsel->core.attr.inherit = 0;
+       evsel->core.attr.watermark = 0;
+       evsel->core.attr.wakeup_events = 1;
+       evsel->core.attr.exclude_kernel = 1;
 
        err = evlist__open(evlist);
        if (err < 0) {
@@ -102,7 +106,7 @@ int test__task_exit(struct test *test __maybe_unused, int subtest __maybe_unused
                goto out_delete_evlist;
        }
 
-       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;
@@ -135,8 +139,8 @@ int test__task_exit(struct test *test __maybe_unused, int subtest __maybe_unused
        }
 
 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;