.. | .. |
---|
5 | 5 | #include "tests.h" |
---|
6 | 6 | #include "debug.h" |
---|
7 | 7 | |
---|
8 | | -static int perf_evsel__test_field(struct perf_evsel *evsel, const char *name, |
---|
| 8 | +static int perf_evsel__test_field(struct evsel *evsel, const char *name, |
---|
9 | 9 | int size, bool should_be_signed) |
---|
10 | 10 | { |
---|
11 | | - struct format_field *field = perf_evsel__field(evsel, name); |
---|
| 11 | + struct tep_format_field *field = evsel__field(evsel, name); |
---|
12 | 12 | int is_signed; |
---|
13 | 13 | int ret = 0; |
---|
14 | 14 | |
---|
.. | .. |
---|
17 | 17 | return -1; |
---|
18 | 18 | } |
---|
19 | 19 | |
---|
20 | | - is_signed = !!(field->flags & FIELD_IS_SIGNED); |
---|
| 20 | + is_signed = !!(field->flags & TEP_FIELD_IS_SIGNED); |
---|
21 | 21 | if (should_be_signed && !is_signed) { |
---|
22 | 22 | pr_debug("%s: \"%s\" signedness(%d) is wrong, should be %d\n", |
---|
23 | 23 | evsel->name, name, is_signed, should_be_signed); |
---|
.. | .. |
---|
35 | 35 | |
---|
36 | 36 | int test__perf_evsel__tp_sched_test(struct test *test __maybe_unused, int subtest __maybe_unused) |
---|
37 | 37 | { |
---|
38 | | - struct perf_evsel *evsel = perf_evsel__newtp("sched", "sched_switch"); |
---|
| 38 | + struct evsel *evsel = evsel__newtp("sched", "sched_switch"); |
---|
39 | 39 | int ret = 0; |
---|
40 | 40 | |
---|
41 | 41 | if (IS_ERR(evsel)) { |
---|
42 | | - pr_debug("perf_evsel__newtp failed with %ld\n", PTR_ERR(evsel)); |
---|
| 42 | + pr_debug("evsel__newtp failed with %ld\n", PTR_ERR(evsel)); |
---|
43 | 43 | return -1; |
---|
44 | 44 | } |
---|
45 | 45 | |
---|
.. | .. |
---|
64 | 64 | if (perf_evsel__test_field(evsel, "next_prio", 4, true)) |
---|
65 | 65 | ret = -1; |
---|
66 | 66 | |
---|
67 | | - perf_evsel__delete(evsel); |
---|
| 67 | + evsel__delete(evsel); |
---|
68 | 68 | |
---|
69 | | - evsel = perf_evsel__newtp("sched", "sched_wakeup"); |
---|
| 69 | + evsel = evsel__newtp("sched", "sched_wakeup"); |
---|
70 | 70 | |
---|
71 | 71 | if (IS_ERR(evsel)) { |
---|
72 | | - pr_debug("perf_evsel__newtp failed with %ld\n", PTR_ERR(evsel)); |
---|
| 72 | + pr_debug("evsel__newtp failed with %ld\n", PTR_ERR(evsel)); |
---|
73 | 73 | return -1; |
---|
74 | 74 | } |
---|
75 | 75 | |
---|
.. | .. |
---|
85 | 85 | if (perf_evsel__test_field(evsel, "target_cpu", 4, true)) |
---|
86 | 86 | ret = -1; |
---|
87 | 87 | |
---|
88 | | - perf_evsel__delete(evsel); |
---|
| 88 | + evsel__delete(evsel); |
---|
89 | 89 | return ret; |
---|
90 | 90 | } |
---|