| .. | .. |
|---|
| 11 | 11 | { |
|---|
| 12 | 12 | char name[128]; |
|---|
| 13 | 13 | int type, op, err = 0, ret = 0, i, idx; |
|---|
| 14 | | - struct perf_evsel *evsel; |
|---|
| 15 | | - struct perf_evlist *evlist = perf_evlist__new(); |
|---|
| 14 | + struct evsel *evsel; |
|---|
| 15 | + struct evlist *evlist = evlist__new(); |
|---|
| 16 | 16 | |
|---|
| 17 | 17 | if (evlist == NULL) |
|---|
| 18 | 18 | return -ENOMEM; |
|---|
| .. | .. |
|---|
| 20 | 20 | for (type = 0; type < PERF_COUNT_HW_CACHE_MAX; type++) { |
|---|
| 21 | 21 | for (op = 0; op < PERF_COUNT_HW_CACHE_OP_MAX; op++) { |
|---|
| 22 | 22 | /* skip invalid cache type */ |
|---|
| 23 | | - if (!perf_evsel__is_cache_op_valid(type, op)) |
|---|
| 23 | + if (!evsel__is_cache_op_valid(type, op)) |
|---|
| 24 | 24 | continue; |
|---|
| 25 | 25 | |
|---|
| 26 | 26 | for (i = 0; i < PERF_COUNT_HW_CACHE_RESULT_MAX; i++) { |
|---|
| 27 | | - __perf_evsel__hw_cache_type_op_res_name(type, op, i, |
|---|
| 28 | | - name, sizeof(name)); |
|---|
| 27 | + __evsel__hw_cache_type_op_res_name(type, op, i, name, sizeof(name)); |
|---|
| 29 | 28 | err = parse_events(evlist, name, NULL); |
|---|
| 30 | 29 | if (err) |
|---|
| 31 | 30 | ret = err; |
|---|
| .. | .. |
|---|
| 34 | 33 | } |
|---|
| 35 | 34 | |
|---|
| 36 | 35 | idx = 0; |
|---|
| 37 | | - evsel = perf_evlist__first(evlist); |
|---|
| 36 | + evsel = evlist__first(evlist); |
|---|
| 38 | 37 | |
|---|
| 39 | 38 | for (type = 0; type < PERF_COUNT_HW_CACHE_MAX; type++) { |
|---|
| 40 | 39 | for (op = 0; op < PERF_COUNT_HW_CACHE_OP_MAX; op++) { |
|---|
| 41 | 40 | /* skip invalid cache type */ |
|---|
| 42 | | - if (!perf_evsel__is_cache_op_valid(type, op)) |
|---|
| 41 | + if (!evsel__is_cache_op_valid(type, op)) |
|---|
| 43 | 42 | continue; |
|---|
| 44 | 43 | |
|---|
| 45 | 44 | for (i = 0; i < PERF_COUNT_HW_CACHE_RESULT_MAX; i++) { |
|---|
| 46 | | - __perf_evsel__hw_cache_type_op_res_name(type, op, i, |
|---|
| 47 | | - name, sizeof(name)); |
|---|
| 45 | + __evsel__hw_cache_type_op_res_name(type, op, i, name, sizeof(name)); |
|---|
| 48 | 46 | if (evsel->idx != idx) |
|---|
| 49 | 47 | continue; |
|---|
| 50 | 48 | |
|---|
| 51 | 49 | ++idx; |
|---|
| 52 | 50 | |
|---|
| 53 | | - if (strcmp(perf_evsel__name(evsel), name)) { |
|---|
| 54 | | - pr_debug("%s != %s\n", perf_evsel__name(evsel), name); |
|---|
| 51 | + if (strcmp(evsel__name(evsel), name)) { |
|---|
| 52 | + pr_debug("%s != %s\n", evsel__name(evsel), name); |
|---|
| 55 | 53 | ret = -1; |
|---|
| 56 | 54 | } |
|---|
| 57 | 55 | |
|---|
| 58 | | - evsel = perf_evsel__next(evsel); |
|---|
| 56 | + evsel = evsel__next(evsel); |
|---|
| 59 | 57 | } |
|---|
| 60 | 58 | } |
|---|
| 61 | 59 | } |
|---|
| 62 | 60 | |
|---|
| 63 | | - perf_evlist__delete(evlist); |
|---|
| 61 | + evlist__delete(evlist); |
|---|
| 64 | 62 | return ret; |
|---|
| 65 | 63 | } |
|---|
| 66 | 64 | |
|---|
| 67 | 65 | static int __perf_evsel__name_array_test(const char *names[], int nr_names) |
|---|
| 68 | 66 | { |
|---|
| 69 | 67 | int i, err; |
|---|
| 70 | | - struct perf_evsel *evsel; |
|---|
| 71 | | - struct perf_evlist *evlist = perf_evlist__new(); |
|---|
| 68 | + struct evsel *evsel; |
|---|
| 69 | + struct evlist *evlist = evlist__new(); |
|---|
| 72 | 70 | |
|---|
| 73 | 71 | if (evlist == NULL) |
|---|
| 74 | 72 | return -ENOMEM; |
|---|
| .. | .. |
|---|
| 84 | 82 | |
|---|
| 85 | 83 | err = 0; |
|---|
| 86 | 84 | evlist__for_each_entry(evlist, evsel) { |
|---|
| 87 | | - if (strcmp(perf_evsel__name(evsel), names[evsel->idx])) { |
|---|
| 85 | + if (strcmp(evsel__name(evsel), names[evsel->idx])) { |
|---|
| 88 | 86 | --err; |
|---|
| 89 | | - pr_debug("%s != %s\n", perf_evsel__name(evsel), names[evsel->idx]); |
|---|
| 87 | + pr_debug("%s != %s\n", evsel__name(evsel), names[evsel->idx]); |
|---|
| 90 | 88 | } |
|---|
| 91 | 89 | } |
|---|
| 92 | 90 | |
|---|
| 93 | 91 | out_delete_evlist: |
|---|
| 94 | | - perf_evlist__delete(evlist); |
|---|
| 92 | + evlist__delete(evlist); |
|---|
| 95 | 93 | return err; |
|---|
| 96 | 94 | } |
|---|
| 97 | 95 | |
|---|
| .. | .. |
|---|
| 102 | 100 | { |
|---|
| 103 | 101 | int err = 0, ret = 0; |
|---|
| 104 | 102 | |
|---|
| 105 | | - err = perf_evsel__name_array_test(perf_evsel__hw_names); |
|---|
| 103 | + err = perf_evsel__name_array_test(evsel__hw_names); |
|---|
| 106 | 104 | if (err) |
|---|
| 107 | 105 | ret = err; |
|---|
| 108 | 106 | |
|---|
| 109 | | - err = __perf_evsel__name_array_test(perf_evsel__sw_names, |
|---|
| 110 | | - PERF_COUNT_SW_DUMMY + 1); |
|---|
| 107 | + err = __perf_evsel__name_array_test(evsel__sw_names, PERF_COUNT_SW_DUMMY + 1); |
|---|
| 111 | 108 | if (err) |
|---|
| 112 | 109 | ret = err; |
|---|
| 113 | 110 | |
|---|