hc
2024-10-12 a5969cabbb4660eab42b6ef0412cbbd1200cf14d
kernel/tools/perf/tests/mmap-basic.c
....@@ -3,14 +3,20 @@
33 #include <inttypes.h>
44 /* For the CLR_() macros */
55 #include <pthread.h>
6
+#include <stdlib.h>
7
+#include <perf/cpumap.h>
68
9
+#include "debug.h"
710 #include "evlist.h"
811 #include "evsel.h"
912 #include "thread_map.h"
10
-#include "cpumap.h"
1113 #include "tests.h"
14
+#include "util/mmap.h"
1215 #include <linux/err.h>
1316 #include <linux/kernel.h>
17
+#include <linux/string.h>
18
+#include <perf/evlist.h>
19
+#include <perf/mmap.h>
1420
1521 /*
1622 * This test will generate random numbers of calls to some getpid syscalls,
....@@ -27,18 +33,18 @@
2733 {
2834 int err = -1;
2935 union perf_event *event;
30
- struct thread_map *threads;
31
- struct cpu_map *cpus;
32
- struct perf_evlist *evlist;
36
+ struct perf_thread_map *threads;
37
+ struct perf_cpu_map *cpus;
38
+ struct evlist *evlist;
3339 cpu_set_t cpu_set;
3440 const char *syscall_names[] = { "getsid", "getppid", "getpgid", };
3541 pid_t (*syscalls[])(void) = { (void *)getsid, getppid, (void*)getpgid };
3642 #define nsyscalls ARRAY_SIZE(syscall_names)
3743 unsigned int nr_events[nsyscalls],
3844 expected_nr_events[nsyscalls], i, j;
39
- struct perf_evsel *evsels[nsyscalls], *evsel;
45
+ struct evsel *evsels[nsyscalls], *evsel;
4046 char sbuf[STRERR_BUFSIZE];
41
- struct perf_mmap *md;
47
+ struct mmap *md;
4248
4349 threads = thread_map__new(-1, getpid(), UINT_MAX);
4450 if (threads == NULL) {
....@@ -46,9 +52,9 @@
4652 return -1;
4753 }
4854
49
- cpus = cpu_map__new(NULL);
55
+ cpus = perf_cpu_map__new(NULL);
5056 if (cpus == NULL) {
51
- pr_debug("cpu_map__new\n");
57
+ pr_debug("perf_cpu_map__new\n");
5258 goto out_free_threads;
5359 }
5460
....@@ -61,30 +67,30 @@
6167 goto out_free_cpus;
6268 }
6369
64
- evlist = perf_evlist__new();
70
+ evlist = evlist__new();
6571 if (evlist == NULL) {
6672 pr_debug("perf_evlist__new\n");
6773 goto out_free_cpus;
6874 }
6975
70
- perf_evlist__set_maps(evlist, cpus, threads);
76
+ perf_evlist__set_maps(&evlist->core, cpus, threads);
7177
7278 for (i = 0; i < nsyscalls; ++i) {
7379 char name[64];
7480
7581 snprintf(name, sizeof(name), "sys_enter_%s", syscall_names[i]);
76
- evsels[i] = perf_evsel__newtp("syscalls", name);
82
+ evsels[i] = evsel__newtp("syscalls", name);
7783 if (IS_ERR(evsels[i])) {
78
- pr_debug("perf_evsel__new(%s)\n", name);
84
+ pr_debug("evsel__new(%s)\n", name);
7985 goto out_delete_evlist;
8086 }
8187
82
- evsels[i]->attr.wakeup_events = 1;
83
- perf_evsel__set_sample_id(evsels[i], false);
88
+ evsels[i]->core.attr.wakeup_events = 1;
89
+ evsel__set_sample_id(evsels[i], false);
8490
85
- perf_evlist__add(evlist, evsels[i]);
91
+ evlist__add(evlist, evsels[i]);
8692
87
- if (perf_evsel__open(evsels[i], cpus, threads) < 0) {
93
+ if (evsel__open(evsels[i], cpus, threads) < 0) {
8894 pr_debug("failed to open counter: %s, "
8995 "tweak /proc/sys/kernel/perf_event_paranoid?\n",
9096 str_error_r(errno, sbuf, sizeof(sbuf)));
....@@ -95,7 +101,7 @@
95101 expected_nr_events[i] = 1 + rand() % 127;
96102 }
97103
98
- if (perf_evlist__mmap(evlist, 128) < 0) {
104
+ if (evlist__mmap(evlist, 128) < 0) {
99105 pr_debug("failed to mmap events: %d (%s)\n", errno,
100106 str_error_r(errno, sbuf, sizeof(sbuf)));
101107 goto out_delete_evlist;
....@@ -108,10 +114,10 @@
108114 }
109115
110116 md = &evlist->mmap[0];
111
- if (perf_mmap__read_init(md) < 0)
117
+ if (perf_mmap__read_init(&md->core) < 0)
112118 goto out_init;
113119
114
- while ((event = perf_mmap__read_event(md)) != NULL) {
120
+ while ((event = perf_mmap__read_event(&md->core)) != NULL) {
115121 struct perf_sample sample;
116122
117123 if (event->header.type != PERF_RECORD_SAMPLE) {
....@@ -134,9 +140,9 @@
134140 goto out_delete_evlist;
135141 }
136142 nr_events[evsel->idx]++;
137
- perf_mmap__consume(md);
143
+ perf_mmap__consume(&md->core);
138144 }
139
- perf_mmap__read_done(md);
145
+ perf_mmap__read_done(&md->core);
140146
141147 out_init:
142148 err = 0;
....@@ -144,19 +150,19 @@
144150 if (nr_events[evsel->idx] != expected_nr_events[evsel->idx]) {
145151 pr_debug("expected %d %s events, got %d\n",
146152 expected_nr_events[evsel->idx],
147
- perf_evsel__name(evsel), nr_events[evsel->idx]);
153
+ evsel__name(evsel), nr_events[evsel->idx]);
148154 err = -1;
149155 goto out_delete_evlist;
150156 }
151157 }
152158
153159 out_delete_evlist:
154
- perf_evlist__delete(evlist);
160
+ evlist__delete(evlist);
155161 cpus = NULL;
156162 threads = NULL;
157163 out_free_cpus:
158
- cpu_map__put(cpus);
164
+ perf_cpu_map__put(cpus);
159165 out_free_threads:
160
- thread_map__put(threads);
166
+ perf_thread_map__put(threads);
161167 return err;
162168 }