hc
2024-02-20 102a0743326a03cd1a1202ceda21e175b7d3575c
kernel/tools/perf/builtin-evlist.c
....@@ -5,40 +5,38 @@
55 */
66 #include "builtin.h"
77
8
-#include "util/util.h"
9
-
108 #include <linux/list.h>
119
1210 #include "perf.h"
1311 #include "util/evlist.h"
1412 #include "util/evsel.h"
13
+#include "util/evsel_fprintf.h"
1514 #include "util/parse-events.h"
1615 #include <subcmd/parse-options.h>
1716 #include "util/session.h"
1817 #include "util/data.h"
1918 #include "util/debug.h"
19
+#include <linux/err.h>
2020
2121 static int __cmd_evlist(const char *file_name, struct perf_attr_details *details)
2222 {
2323 struct perf_session *session;
24
- struct perf_evsel *pos;
24
+ struct evsel *pos;
2525 struct perf_data data = {
26
- .file = {
27
- .path = file_name,
28
- },
26
+ .path = file_name,
2927 .mode = PERF_DATA_MODE_READ,
3028 .force = details->force,
3129 };
3230 bool has_tracepoint = false;
3331
3432 session = perf_session__new(&data, 0, NULL);
35
- if (session == NULL)
36
- return -1;
33
+ if (IS_ERR(session))
34
+ return PTR_ERR(session);
3735
3836 evlist__for_each_entry(session->evlist, pos) {
39
- perf_evsel__fprintf(pos, details, stdout);
37
+ evsel__fprintf(pos, details, stdout);
4038
41
- if (pos->attr.type == PERF_TYPE_TRACEPOINT)
39
+ if (pos->core.attr.type == PERF_TYPE_TRACEPOINT)
4240 has_tracepoint = true;
4341 }
4442