forked from ~ljy/RK356X_SDK_RELEASE

hc
2024-12-19 9370bb92b2d16684ee45cf24e879c93c509162da
kernel/tools/perf/tests/hists_link.c
....@@ -1,5 +1,4 @@
11 // SPDX-License-Identifier: GPL-2.0
2
-#include "perf.h"
32 #include "tests.h"
43 #include "debug.h"
54 #include "symbol.h"
....@@ -7,9 +6,9 @@
76 #include "evsel.h"
87 #include "evlist.h"
98 #include "machine.h"
10
-#include "thread.h"
119 #include "parse-events.h"
1210 #include "hists_common.h"
11
+#include "util/mmap.h"
1312 #include <errno.h>
1413 #include <linux/kernel.h>
1514
....@@ -62,9 +61,9 @@
6261 },
6362 };
6463
65
-static int add_hist_entries(struct perf_evlist *evlist, struct machine *machine)
64
+static int add_hist_entries(struct evlist *evlist, struct machine *machine)
6665 {
67
- struct perf_evsel *evsel;
66
+ struct evsel *evsel;
6867 struct addr_location al;
6968 struct hist_entry *he;
7069 struct perf_sample sample = { .period = 1, .weight = 1, };
....@@ -142,7 +141,7 @@
142141 static int __validate_match(struct hists *hists)
143142 {
144143 size_t count = 0;
145
- struct rb_root *root;
144
+ struct rb_root_cached *root;
146145 struct rb_node *node;
147146
148147 /*
....@@ -153,7 +152,7 @@
153152 else
154153 root = hists->entries_in;
155154
156
- node = rb_first(root);
155
+ node = rb_first_cached(root);
157156 while (node) {
158157 struct hist_entry *he;
159158
....@@ -192,7 +191,7 @@
192191 size_t count = 0;
193192 size_t count_pair = 0;
194193 size_t count_dummy = 0;
195
- struct rb_root *root;
194
+ struct rb_root_cached *root;
196195 struct rb_node *node;
197196
198197 /*
....@@ -205,7 +204,7 @@
205204 else
206205 root = hists->entries_in;
207206
208
- node = rb_first(root);
207
+ node = rb_first_cached(root);
209208 while (node) {
210209 struct hist_entry *he;
211210
....@@ -271,8 +270,8 @@
271270 struct hists *hists, *first_hists;
272271 struct machines machines;
273272 struct machine *machine = NULL;
274
- struct perf_evsel *evsel, *first;
275
- struct perf_evlist *evlist = perf_evlist__new();
273
+ struct evsel *evsel, *first;
274
+ struct evlist *evlist = evlist__new();
276275
277276 if (evlist == NULL)
278277 return -ENOMEM;
....@@ -312,8 +311,8 @@
312311 print_hists_in(hists);
313312 }
314313
315
- first = perf_evlist__first(evlist);
316
- evsel = perf_evlist__last(evlist);
314
+ first = evlist__first(evlist);
315
+ evsel = evlist__last(evlist);
317316
318317 first_hists = evsel__hists(first);
319318 hists = evsel__hists(evsel);
....@@ -334,7 +333,7 @@
334333
335334 out:
336335 /* tear down everything */
337
- perf_evlist__delete(evlist);
336
+ evlist__delete(evlist);
338337 reset_output_field();
339338 machines__exit(&machines);
340339