| .. | .. |
|---|
| 1 | 1 | // SPDX-License-Identifier: GPL-2.0 |
|---|
| 2 | 2 | #include "tests/tests.h" |
|---|
| 3 | | -#include "perf.h" |
|---|
| 4 | 3 | #include "cloexec.h" |
|---|
| 5 | 4 | #include "debug.h" |
|---|
| 6 | 5 | #include "evlist.h" |
|---|
| 7 | 6 | #include "evsel.h" |
|---|
| 8 | 7 | #include "arch-tests.h" |
|---|
| 8 | +#include <internal/lib.h> // page_size |
|---|
| 9 | 9 | |
|---|
| 10 | 10 | #include <signal.h> |
|---|
| 11 | 11 | #include <sys/mman.h> |
|---|
| .. | .. |
|---|
| 39 | 39 | */ |
|---|
| 40 | 40 | int test__intel_cqm_count_nmi_context(struct test *test __maybe_unused, int subtest __maybe_unused) |
|---|
| 41 | 41 | { |
|---|
| 42 | | - struct perf_evlist *evlist = NULL; |
|---|
| 43 | | - struct perf_evsel *evsel = NULL; |
|---|
| 42 | + struct evlist *evlist = NULL; |
|---|
| 43 | + struct evsel *evsel = NULL; |
|---|
| 44 | 44 | struct perf_event_attr pe; |
|---|
| 45 | 45 | int i, fd[2], flag, ret; |
|---|
| 46 | 46 | size_t mmap_len; |
|---|
| .. | .. |
|---|
| 50 | 50 | |
|---|
| 51 | 51 | flag = perf_event_open_cloexec_flag(); |
|---|
| 52 | 52 | |
|---|
| 53 | | - evlist = perf_evlist__new(); |
|---|
| 53 | + evlist = evlist__new(); |
|---|
| 54 | 54 | if (!evlist) { |
|---|
| 55 | 55 | pr_debug("perf_evlist__new failed\n"); |
|---|
| 56 | 56 | return TEST_FAIL; |
|---|
| .. | .. |
|---|
| 63 | 63 | goto out; |
|---|
| 64 | 64 | } |
|---|
| 65 | 65 | |
|---|
| 66 | | - evsel = perf_evlist__first(evlist); |
|---|
| 66 | + evsel = evlist__first(evlist); |
|---|
| 67 | 67 | if (!evsel) { |
|---|
| 68 | | - pr_debug("perf_evlist__first failed\n"); |
|---|
| 68 | + pr_debug("evlist__first failed\n"); |
|---|
| 69 | 69 | goto out; |
|---|
| 70 | 70 | } |
|---|
| 71 | 71 | |
|---|
| .. | .. |
|---|
| 123 | 123 | kill(pid, SIGKILL); |
|---|
| 124 | 124 | wait(NULL); |
|---|
| 125 | 125 | out: |
|---|
| 126 | | - perf_evlist__delete(evlist); |
|---|
| 126 | + evlist__delete(evlist); |
|---|
| 127 | 127 | return err; |
|---|
| 128 | 128 | } |
|---|