.. | .. |
---|
1 | 1 | // SPDX-License-Identifier: GPL-2.0 |
---|
| 2 | +#include <stdbool.h> |
---|
2 | 3 | #include <linux/err.h> |
---|
| 4 | +#include <linux/string.h> |
---|
3 | 5 | #include <sys/types.h> |
---|
4 | 6 | #include <sys/stat.h> |
---|
5 | 7 | #include <fcntl.h> |
---|
6 | | -#include "perf.h" |
---|
7 | 8 | #include "evlist.h" |
---|
8 | 9 | #include "evsel.h" |
---|
9 | 10 | #include "thread_map.h" |
---|
| 11 | +#include "record.h" |
---|
10 | 12 | #include "tests.h" |
---|
11 | 13 | #include "debug.h" |
---|
| 14 | +#include "util/mmap.h" |
---|
12 | 15 | #include <errno.h> |
---|
| 16 | +#include <perf/mmap.h> |
---|
13 | 17 | |
---|
14 | 18 | #ifndef O_DIRECTORY |
---|
15 | 19 | #define O_DIRECTORY 00200000 |
---|
.. | .. |
---|
32 | 36 | }; |
---|
33 | 37 | const char *filename = "/etc/passwd"; |
---|
34 | 38 | int flags = O_RDONLY | O_DIRECTORY; |
---|
35 | | - struct perf_evlist *evlist = perf_evlist__new(); |
---|
36 | | - struct perf_evsel *evsel; |
---|
| 39 | + struct evlist *evlist = evlist__new(); |
---|
| 40 | + struct evsel *evsel; |
---|
37 | 41 | int err = -1, i, nr_events = 0, nr_polls = 0; |
---|
38 | 42 | char sbuf[STRERR_BUFSIZE]; |
---|
39 | 43 | |
---|
.. | .. |
---|
42 | 46 | goto out; |
---|
43 | 47 | } |
---|
44 | 48 | |
---|
45 | | - evsel = perf_evsel__newtp("syscalls", "sys_enter_openat"); |
---|
| 49 | + evsel = evsel__newtp("syscalls", "sys_enter_openat"); |
---|
46 | 50 | if (IS_ERR(evsel)) { |
---|
47 | | - pr_debug("%s: perf_evsel__newtp\n", __func__); |
---|
| 51 | + pr_debug("%s: evsel__newtp\n", __func__); |
---|
48 | 52 | goto out_delete_evlist; |
---|
49 | 53 | } |
---|
50 | 54 | |
---|
51 | | - perf_evlist__add(evlist, evsel); |
---|
| 55 | + evlist__add(evlist, evsel); |
---|
52 | 56 | |
---|
53 | 57 | err = perf_evlist__create_maps(evlist, &opts.target); |
---|
54 | 58 | if (err < 0) { |
---|
.. | .. |
---|
56 | 60 | goto out_delete_evlist; |
---|
57 | 61 | } |
---|
58 | 62 | |
---|
59 | | - perf_evsel__config(evsel, &opts, NULL); |
---|
| 63 | + evsel__config(evsel, &opts, NULL); |
---|
60 | 64 | |
---|
61 | | - thread_map__set_pid(evlist->threads, 0, getpid()); |
---|
| 65 | + perf_thread_map__set_pid(evlist->core.threads, 0, getpid()); |
---|
62 | 66 | |
---|
63 | | - err = perf_evlist__open(evlist); |
---|
| 67 | + err = evlist__open(evlist); |
---|
64 | 68 | if (err < 0) { |
---|
65 | 69 | pr_debug("perf_evlist__open: %s\n", |
---|
66 | 70 | str_error_r(errno, sbuf, sizeof(sbuf))); |
---|
67 | 71 | goto out_delete_evlist; |
---|
68 | 72 | } |
---|
69 | 73 | |
---|
70 | | - err = perf_evlist__mmap(evlist, UINT_MAX); |
---|
| 74 | + err = evlist__mmap(evlist, UINT_MAX); |
---|
71 | 75 | if (err < 0) { |
---|
72 | | - pr_debug("perf_evlist__mmap: %s\n", |
---|
| 76 | + pr_debug("evlist__mmap: %s\n", |
---|
73 | 77 | str_error_r(errno, sbuf, sizeof(sbuf))); |
---|
74 | 78 | goto out_delete_evlist; |
---|
75 | 79 | } |
---|
76 | 80 | |
---|
77 | | - perf_evlist__enable(evlist); |
---|
| 81 | + evlist__enable(evlist); |
---|
78 | 82 | |
---|
79 | 83 | /* |
---|
80 | 84 | * Generate the event: |
---|
.. | .. |
---|
84 | 88 | while (1) { |
---|
85 | 89 | int before = nr_events; |
---|
86 | 90 | |
---|
87 | | - for (i = 0; i < evlist->nr_mmaps; i++) { |
---|
| 91 | + for (i = 0; i < evlist->core.nr_mmaps; i++) { |
---|
88 | 92 | union perf_event *event; |
---|
89 | | - struct perf_mmap *md; |
---|
| 93 | + struct mmap *md; |
---|
90 | 94 | |
---|
91 | 95 | md = &evlist->mmap[i]; |
---|
92 | | - if (perf_mmap__read_init(md) < 0) |
---|
| 96 | + if (perf_mmap__read_init(&md->core) < 0) |
---|
93 | 97 | continue; |
---|
94 | 98 | |
---|
95 | | - while ((event = perf_mmap__read_event(md)) != NULL) { |
---|
| 99 | + while ((event = perf_mmap__read_event(&md->core)) != NULL) { |
---|
96 | 100 | const u32 type = event->header.type; |
---|
97 | 101 | int tp_flags; |
---|
98 | 102 | struct perf_sample sample; |
---|
.. | .. |
---|
100 | 104 | ++nr_events; |
---|
101 | 105 | |
---|
102 | 106 | if (type != PERF_RECORD_SAMPLE) { |
---|
103 | | - perf_mmap__consume(md); |
---|
| 107 | + perf_mmap__consume(&md->core); |
---|
104 | 108 | continue; |
---|
105 | 109 | } |
---|
106 | 110 | |
---|
107 | | - err = perf_evsel__parse_sample(evsel, event, &sample); |
---|
| 111 | + err = evsel__parse_sample(evsel, event, &sample); |
---|
108 | 112 | if (err) { |
---|
109 | 113 | pr_debug("Can't parse sample, err = %d\n", err); |
---|
110 | 114 | goto out_delete_evlist; |
---|
111 | 115 | } |
---|
112 | 116 | |
---|
113 | | - tp_flags = perf_evsel__intval(evsel, &sample, "flags"); |
---|
| 117 | + tp_flags = evsel__intval(evsel, &sample, "flags"); |
---|
114 | 118 | |
---|
115 | 119 | if (flags != tp_flags) { |
---|
116 | 120 | pr_debug("%s: Expected flags=%#x, got %#x\n", |
---|
.. | .. |
---|
120 | 124 | |
---|
121 | 125 | goto out_ok; |
---|
122 | 126 | } |
---|
123 | | - perf_mmap__read_done(md); |
---|
| 127 | + perf_mmap__read_done(&md->core); |
---|
124 | 128 | } |
---|
125 | 129 | |
---|
126 | 130 | if (nr_events == before) |
---|
127 | | - perf_evlist__poll(evlist, 10); |
---|
| 131 | + evlist__poll(evlist, 10); |
---|
128 | 132 | |
---|
129 | 133 | if (++nr_polls > 5) { |
---|
130 | 134 | pr_debug("%s: no events!\n", __func__); |
---|
.. | .. |
---|
134 | 138 | out_ok: |
---|
135 | 139 | err = 0; |
---|
136 | 140 | out_delete_evlist: |
---|
137 | | - perf_evlist__delete(evlist); |
---|
| 141 | + evlist__delete(evlist); |
---|
138 | 142 | out: |
---|
139 | 143 | return err; |
---|
140 | 144 | } |
---|