hc
2023-12-09 b22da3d8526a935aa31e086e63f60ff3246cb61c
kernel/tools/perf/tests/backward-ring-buffer.c
....@@ -4,12 +4,16 @@
44 * beginning
55 */
66
7
-#include <perf.h>
87 #include <evlist.h>
98 #include <sys/prctl.h>
9
+#include "record.h"
1010 #include "tests.h"
1111 #include "debug.h"
12
+#include "parse-events.h"
13
+#include "util/mmap.h"
1214 #include <errno.h>
15
+#include <linux/string.h>
16
+#include <perf/mmap.h>
1317
1418 #define NR_ITERS 111
1519
....@@ -18,24 +22,24 @@
1822 int i;
1923
2024 for (i = 0; i < NR_ITERS; i++) {
21
- char proc_name[10];
25
+ char proc_name[15];
2226
2327 snprintf(proc_name, sizeof(proc_name), "p:%d\n", i);
2428 prctl(PR_SET_NAME, proc_name);
2529 }
2630 }
2731
28
-static int count_samples(struct perf_evlist *evlist, int *sample_count,
32
+static int count_samples(struct evlist *evlist, int *sample_count,
2933 int *comm_count)
3034 {
3135 int i;
3236
33
- for (i = 0; i < evlist->nr_mmaps; i++) {
34
- struct perf_mmap *map = &evlist->overwrite_mmap[i];
37
+ for (i = 0; i < evlist->core.nr_mmaps; i++) {
38
+ struct mmap *map = &evlist->overwrite_mmap[i];
3539 union perf_event *event;
3640
37
- perf_mmap__read_init(map);
38
- while ((event = perf_mmap__read_event(map)) != NULL) {
41
+ perf_mmap__read_init(&map->core);
42
+ while ((event = perf_mmap__read_event(&map->core)) != NULL) {
3943 const u32 type = event->header.type;
4044
4145 switch (type) {
....@@ -50,30 +54,30 @@
5054 return TEST_FAIL;
5155 }
5256 }
53
- perf_mmap__read_done(map);
57
+ perf_mmap__read_done(&map->core);
5458 }
5559 return TEST_OK;
5660 }
5761
58
-static int do_test(struct perf_evlist *evlist, int mmap_pages,
62
+static int do_test(struct evlist *evlist, int mmap_pages,
5963 int *sample_count, int *comm_count)
6064 {
6165 int err;
6266 char sbuf[STRERR_BUFSIZE];
6367
64
- err = perf_evlist__mmap(evlist, mmap_pages);
68
+ err = evlist__mmap(evlist, mmap_pages);
6569 if (err < 0) {
66
- pr_debug("perf_evlist__mmap: %s\n",
70
+ pr_debug("evlist__mmap: %s\n",
6771 str_error_r(errno, sbuf, sizeof(sbuf)));
6872 return TEST_FAIL;
6973 }
7074
71
- perf_evlist__enable(evlist);
75
+ evlist__enable(evlist);
7276 testcase();
73
- perf_evlist__disable(evlist);
77
+ evlist__disable(evlist);
7478
7579 err = count_samples(evlist, sample_count, comm_count);
76
- perf_evlist__munmap(evlist);
80
+ evlist__munmap(evlist);
7781 return err;
7882 }
7983
....@@ -82,8 +86,8 @@
8286 {
8387 int ret = TEST_SKIP, err, sample_count = 0, comm_count = 0;
8488 char pid[16], sbuf[STRERR_BUFSIZE];
85
- struct perf_evlist *evlist;
86
- struct perf_evsel *evsel __maybe_unused;
89
+ struct evlist *evlist;
90
+ struct evsel *evsel __maybe_unused;
8791 struct parse_events_error parse_error;
8892 struct record_opts opts = {
8993 .target = {
....@@ -99,7 +103,7 @@
99103 pid[sizeof(pid) - 1] = '\0';
100104 opts.target.tid = opts.target.pid = pid;
101105
102
- evlist = perf_evlist__new();
106
+ evlist = evlist__new();
103107 if (!evlist) {
104108 pr_debug("Not enough memory to create evlist\n");
105109 return TEST_FAIL;
....@@ -125,7 +129,7 @@
125129
126130 perf_evlist__config(evlist, &opts, NULL);
127131
128
- err = perf_evlist__open(evlist);
132
+ err = evlist__open(evlist);
129133 if (err < 0) {
130134 pr_debug("perf_evlist__open: %s\n",
131135 str_error_r(errno, sbuf, sizeof(sbuf)));
....@@ -144,12 +148,21 @@
144148 goto out_delete_evlist;
145149 }
146150
151
+ evlist__close(evlist);
152
+
153
+ err = evlist__open(evlist);
154
+ if (err < 0) {
155
+ pr_debug("perf_evlist__open: %s\n",
156
+ str_error_r(errno, sbuf, sizeof(sbuf)));
157
+ goto out_delete_evlist;
158
+ }
159
+
147160 err = do_test(evlist, 1, &sample_count, &comm_count);
148161 if (err != TEST_OK)
149162 goto out_delete_evlist;
150163
151164 ret = TEST_OK;
152165 out_delete_evlist:
153
- perf_evlist__delete(evlist);
166
+ evlist__delete(evlist);
154167 return ret;
155168 }