Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

perf evsel: Rename perf_evsel__new*() to evsel__new*()

As these are 'struct evsel' methods, not part of tools/lib/perf/, aka
libperf, to whom the perf_ prefix belongs.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

+32 -33
+5 -5
tools/perf/builtin-trace.c
··· 461 461 462 462 static struct evsel *perf_evsel__raw_syscall_newtp(const char *direction, void *handler) 463 463 { 464 - struct evsel *evsel = perf_evsel__newtp("raw_syscalls", direction); 464 + struct evsel *evsel = evsel__newtp("raw_syscalls", direction); 465 465 466 466 /* older kernel (e.g., RHEL6) use syscalls:{enter,exit} */ 467 467 if (IS_ERR(evsel)) 468 - evsel = perf_evsel__newtp("syscalls", direction); 468 + evsel = evsel__newtp("syscalls", direction); 469 469 470 470 if (IS_ERR(evsel)) 471 471 return NULL; ··· 3045 3045 return found; 3046 3046 } 3047 3047 3048 - static struct evsel *perf_evsel__new_pgfault(u64 config) 3048 + static struct evsel *evsel__new_pgfault(u64 config) 3049 3049 { 3050 3050 struct evsel *evsel; 3051 3051 struct perf_event_attr attr = { ··· 3841 3841 } 3842 3842 3843 3843 if ((trace->trace_pgfaults & TRACE_PFMAJ)) { 3844 - pgfault_maj = perf_evsel__new_pgfault(PERF_COUNT_SW_PAGE_FAULTS_MAJ); 3844 + pgfault_maj = evsel__new_pgfault(PERF_COUNT_SW_PAGE_FAULTS_MAJ); 3845 3845 if (pgfault_maj == NULL) 3846 3846 goto out_error_mem; 3847 3847 evsel__config_callchain(pgfault_maj, &trace->opts, &callchain_param); ··· 3849 3849 } 3850 3850 3851 3851 if ((trace->trace_pgfaults & TRACE_PFMIN)) { 3852 - pgfault_min = perf_evsel__new_pgfault(PERF_COUNT_SW_PAGE_FAULTS_MIN); 3852 + pgfault_min = evsel__new_pgfault(PERF_COUNT_SW_PAGE_FAULTS_MIN); 3853 3853 if (pgfault_min == NULL) 3854 3854 goto out_error_mem; 3855 3855 evsel__config_callchain(pgfault_min, &trace->opts, &callchain_param);
+4 -4
tools/perf/tests/evsel-tp-sched.c
··· 35 35 36 36 int test__perf_evsel__tp_sched_test(struct test *test __maybe_unused, int subtest __maybe_unused) 37 37 { 38 - struct 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 ··· 66 66 67 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
+2 -2
tools/perf/tests/mmap-basic.c
··· 79 79 char name[64]; 80 80 81 81 snprintf(name, sizeof(name), "sys_enter_%s", syscall_names[i]); 82 - evsels[i] = perf_evsel__newtp("syscalls", name); 82 + evsels[i] = evsel__newtp("syscalls", name); 83 83 if (IS_ERR(evsels[i])) { 84 - pr_debug("perf_evsel__new(%s)\n", name); 84 + pr_debug("evsel__new(%s)\n", name); 85 85 goto out_delete_evlist; 86 86 } 87 87
+1 -1
tools/perf/tests/openat-syscall-all-cpus.c
··· 44 44 45 45 CPU_ZERO(&cpu_set); 46 46 47 - evsel = perf_evsel__newtp("syscalls", "sys_enter_openat"); 47 + evsel = evsel__newtp("syscalls", "sys_enter_openat"); 48 48 if (IS_ERR(evsel)) { 49 49 tracing_path__strerror_open_tp(errno, errbuf, sizeof(errbuf), "syscalls", "sys_enter_openat"); 50 50 pr_debug("%s\n", errbuf);
+2 -2
tools/perf/tests/openat-syscall-tp-fields.c
··· 46 46 goto out; 47 47 } 48 48 49 - evsel = perf_evsel__newtp("syscalls", "sys_enter_openat"); 49 + evsel = evsel__newtp("syscalls", "sys_enter_openat"); 50 50 if (IS_ERR(evsel)) { 51 - pr_debug("%s: perf_evsel__newtp\n", __func__); 51 + pr_debug("%s: evsel__newtp\n", __func__); 52 52 goto out_delete_evlist; 53 53 } 54 54
+1 -1
tools/perf/tests/openat-syscall.c
··· 27 27 return -1; 28 28 } 29 29 30 - evsel = perf_evsel__newtp("syscalls", "sys_enter_openat"); 30 + evsel = evsel__newtp("syscalls", "sys_enter_openat"); 31 31 if (IS_ERR(evsel)) { 32 32 tracing_path__strerror_open_tp(errno, errbuf, sizeof(errbuf), "syscalls", "sys_enter_openat"); 33 33 pr_debug("%s\n", errbuf);
+1 -1
tools/perf/tests/sw-clock.c
··· 56 56 57 57 evsel = evsel__new(&attr); 58 58 if (evsel == NULL) { 59 - pr_debug("perf_evsel__new\n"); 59 + pr_debug("evsel__new\n"); 60 60 goto out_delete_evlist; 61 61 } 62 62 evlist__add(evlist, evsel);
+4 -4
tools/perf/util/evlist.c
··· 233 233 234 234 int __perf_evlist__add_default(struct evlist *evlist, bool precise) 235 235 { 236 - struct evsel *evsel = perf_evsel__new_cycles(precise); 236 + struct evsel *evsel = evsel__new_cycles(precise); 237 237 238 238 if (evsel == NULL) 239 239 return -ENOMEM; ··· 249 249 .config = PERF_COUNT_SW_DUMMY, 250 250 .size = sizeof(attr), /* to capture ABI version */ 251 251 }; 252 - struct evsel *evsel = perf_evsel__new_idx(&attr, evlist->core.nr_entries); 252 + struct evsel *evsel = evsel__new_idx(&attr, evlist->core.nr_entries); 253 253 254 254 if (evsel == NULL) 255 255 return -ENOMEM; ··· 266 266 size_t i; 267 267 268 268 for (i = 0; i < nr_attrs; i++) { 269 - evsel = perf_evsel__new_idx(attrs + i, evlist->core.nr_entries + i); 269 + evsel = evsel__new_idx(attrs + i, evlist->core.nr_entries + i); 270 270 if (evsel == NULL) 271 271 goto out_delete_partial_list; 272 272 list_add_tail(&evsel->core.node, &head); ··· 325 325 int perf_evlist__add_newtp(struct evlist *evlist, 326 326 const char *sys, const char *name, void *handler) 327 327 { 328 - struct evsel *evsel = perf_evsel__newtp(sys, name); 328 + struct evsel *evsel = evsel__newtp(sys, name); 329 329 330 330 if (IS_ERR(evsel)) 331 331 return -1;
+3 -3
tools/perf/util/evsel.c
··· 258 258 evsel->pmu_name = NULL; 259 259 } 260 260 261 - struct evsel *perf_evsel__new_idx(struct perf_event_attr *attr, int idx) 261 + struct evsel *evsel__new_idx(struct perf_event_attr *attr, int idx) 262 262 { 263 263 struct evsel *evsel = zalloc(perf_evsel__object.size); 264 264 ··· 291 291 return perf_event_paranoid_check(1); 292 292 } 293 293 294 - struct evsel *perf_evsel__new_cycles(bool precise) 294 + struct evsel *evsel__new_cycles(bool precise) 295 295 { 296 296 struct perf_event_attr attr = { 297 297 .type = PERF_TYPE_HARDWARE, ··· 333 333 /* 334 334 * Returns pointer with encoded error via <linux/err.h> interface. 335 335 */ 336 - struct evsel *perf_evsel__newtp_idx(const char *sys, const char *name, int idx) 336 + struct evsel *evsel__newtp_idx(const char *sys, const char *name, int idx) 337 337 { 338 338 struct evsel *evsel = zalloc(perf_evsel__object.size); 339 339 int err = -ENOMEM;
+6 -6
tools/perf/util/evsel.h
··· 161 161 struct perf_pmu *evsel__find_pmu(struct evsel *evsel); 162 162 bool evsel__is_aux_event(struct evsel *evsel); 163 163 164 - struct evsel *perf_evsel__new_idx(struct perf_event_attr *attr, int idx); 164 + struct evsel *evsel__new_idx(struct perf_event_attr *attr, int idx); 165 165 166 166 static inline struct evsel *evsel__new(struct perf_event_attr *attr) 167 167 { 168 - return perf_evsel__new_idx(attr, 0); 168 + return evsel__new_idx(attr, 0); 169 169 } 170 170 171 - struct evsel *perf_evsel__newtp_idx(const char *sys, const char *name, int idx); 171 + struct evsel *evsel__newtp_idx(const char *sys, const char *name, int idx); 172 172 173 173 /* 174 174 * Returns pointer with encoded error via <linux/err.h> interface. 175 175 */ 176 - static inline struct evsel *perf_evsel__newtp(const char *sys, const char *name) 176 + static inline struct evsel *evsel__newtp(const char *sys, const char *name) 177 177 { 178 - return perf_evsel__newtp_idx(sys, name, 0); 178 + return evsel__newtp_idx(sys, name, 0); 179 179 } 180 180 181 - struct evsel *perf_evsel__new_cycles(bool precise); 181 + struct evsel *evsel__new_cycles(bool precise); 182 182 183 183 struct tep_event *event_format__new(const char *sys, const char *name); 184 184
+2 -3
tools/perf/util/parse-events.c
··· 354 354 355 355 event_attr_init(attr); 356 356 357 - evsel = perf_evsel__new_idx(attr, *idx); 357 + evsel = evsel__new_idx(attr, *idx); 358 358 if (!evsel) 359 359 return NULL; 360 360 ··· 538 538 struct parse_events_error *err, 539 539 struct list_head *head_config) 540 540 { 541 - struct evsel *evsel; 541 + struct evsel *evsel = evsel__newtp_idx(sys_name, evt_name, (*idx)++); 542 542 543 - evsel = perf_evsel__newtp_idx(sys_name, evt_name, (*idx)++); 544 543 if (IS_ERR(evsel)) { 545 544 tracepoint_error(err, PTR_ERR(evsel), sys_name, evt_name); 546 545 return PTR_ERR(evsel);
+1 -1
tools/perf/util/sideband_evlist.c
··· 22 22 attr->sample_id_all = 1; 23 23 } 24 24 25 - evsel = perf_evsel__new_idx(attr, evlist->core.nr_entries); 25 + evsel = evsel__new_idx(attr, evlist->core.nr_entries); 26 26 if (!evsel) 27 27 return -1; 28 28