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

tools lib traceevent, perf tools: Rename pevent_set_* APIs

In order to make libtraceevent into a proper library, variables, data
structures and functions require a unique prefix to prevent name space
conflicts. That prefix will be "tep_" and not "pevent_". This changes
APIs: pevent_set_file_bigendian, pevent_set_flag,
pevent_set_function_resolver, pevent_set_host_bigendian,
pevent_set_long_size, pevent_set_page_size and pevent_get_long_size

Signed-off-by: Tzvetomir Stoyanov (VMware) <tz.stoyanov@gmail.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Yordan Karadzhov (VMware) <y.karadz@gmail.com>
Cc: linux-trace-devel@vger.kernel.org
Link: http://lkml.kernel.org/r/20180808180701.256265951@goodmis.org
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

authored by

Tzvetomir Stoyanov (VMware) and committed by
Arnaldo Carvalho de Melo
ece2a4f4 13a41890

+29 -29
+3 -3
tools/lib/traceevent/event-parse.c
··· 444 444 }; 445 445 446 446 /** 447 - * pevent_set_function_resolver - set an alternative function resolver 447 + * tep_set_function_resolver - set an alternative function resolver 448 448 * @pevent: handle for the pevent 449 449 * @resolver: function to be used 450 450 * @priv: resolver function private state. ··· 453 453 * keep using it instead of duplicating all the entries inside 454 454 * pevent->funclist. 455 455 */ 456 - int pevent_set_function_resolver(struct tep_handle *pevent, 457 - tep_func_resolver_t *func, void *priv) 456 + int tep_set_function_resolver(struct tep_handle *pevent, 457 + tep_func_resolver_t *func, void *priv) 458 458 { 459 459 struct func_resolver *resolver = malloc(sizeof(*resolver)); 460 460
+8 -8
tools/lib/traceevent/event-parse.h
··· 532 532 char *trace_clock; 533 533 }; 534 534 535 - static inline void pevent_set_flag(struct tep_handle *pevent, int flag) 535 + static inline void tep_set_flag(struct tep_handle *pevent, int flag) 536 536 { 537 537 pevent->flags |= flag; 538 538 } ··· 615 615 TRACE_FLAG_SOFTIRQ = 0x10, 616 616 }; 617 617 618 - int pevent_set_function_resolver(struct tep_handle *pevent, 619 - tep_func_resolver_t *func, void *priv); 618 + int tep_set_function_resolver(struct tep_handle *pevent, 619 + tep_func_resolver_t *func, void *priv); 620 620 void pevent_reset_function_resolver(struct tep_handle *pevent); 621 621 int tep_register_comm(struct tep_handle *pevent, const char *comm, int pid); 622 622 int pevent_register_trace_clock(struct tep_handle *pevent, const char *trace_clock); ··· 741 741 pevent->cpus = cpus; 742 742 } 743 743 744 - static inline int pevent_get_long_size(struct tep_handle *pevent) 744 + static inline int tep_get_long_size(struct tep_handle *pevent) 745 745 { 746 746 return pevent->long_size; 747 747 } 748 748 749 - static inline void pevent_set_long_size(struct tep_handle *pevent, int long_size) 749 + static inline void tep_set_long_size(struct tep_handle *pevent, int long_size) 750 750 { 751 751 pevent->long_size = long_size; 752 752 } ··· 756 756 return pevent->page_size; 757 757 } 758 758 759 - static inline void pevent_set_page_size(struct tep_handle *pevent, int _page_size) 759 + static inline void tep_set_page_size(struct tep_handle *pevent, int _page_size) 760 760 { 761 761 pevent->page_size = _page_size; 762 762 } ··· 766 766 return pevent->file_bigendian; 767 767 } 768 768 769 - static inline void pevent_set_file_bigendian(struct tep_handle *pevent, int endian) 769 + static inline void tep_set_file_bigendian(struct tep_handle *pevent, int endian) 770 770 { 771 771 pevent->file_bigendian = endian; 772 772 } ··· 776 776 return pevent->host_bigendian; 777 777 } 778 778 779 - static inline void pevent_set_host_bigendian(struct tep_handle *pevent, int endian) 779 + static inline void tep_set_host_bigendian(struct tep_handle *pevent, int endian) 780 780 { 781 781 pevent->host_bigendian = endian; 782 782 }
+3 -3
tools/perf/builtin-report.c
··· 1369 1369 } 1370 1370 1371 1371 if (session->tevent.pevent && 1372 - pevent_set_function_resolver(session->tevent.pevent, 1373 - machine__resolve_kernel_addr, 1374 - &session->machines.host) < 0) { 1372 + tep_set_function_resolver(session->tevent.pevent, 1373 + machine__resolve_kernel_addr, 1374 + &session->machines.host) < 0) { 1375 1375 pr_err("%s: failed to set libtraceevent function resolver\n", 1376 1376 __func__); 1377 1377 return -1;
+3 -3
tools/perf/builtin-script.c
··· 3429 3429 symbol_conf.use_callchain = false; 3430 3430 3431 3431 if (session->tevent.pevent && 3432 - pevent_set_function_resolver(session->tevent.pevent, 3433 - machine__resolve_kernel_addr, 3434 - &session->machines.host) < 0) { 3432 + tep_set_function_resolver(session->tevent.pevent, 3433 + machine__resolve_kernel_addr, 3434 + &session->machines.host) < 0) { 3435 3435 pr_err("%s: failed to set libtraceevent function resolver\n", __func__); 3436 3436 err = -1; 3437 3437 goto out_delete;
+1 -1
tools/perf/util/machine.h
··· 265 265 int machine__set_current_tid(struct machine *machine, int cpu, pid_t pid, 266 266 pid_t tid); 267 267 /* 268 - * For use with libtraceevent's pevent_set_function_resolver() 268 + * For use with libtraceevent's tep_set_function_resolver() 269 269 */ 270 270 char *machine__resolve_kernel_addr(void *vmachine, unsigned long long *addrp, char **modp); 271 271
+7 -7
tools/perf/util/trace-event-read.c
··· 236 236 } 237 237 238 238 if (!tep_parse_header_page(pevent, header_page, size, 239 - pevent_get_long_size(pevent))) { 239 + tep_get_long_size(pevent))) { 240 240 /* 241 241 * The commit field in the page is of type long, 242 242 * use that instead, since it represents the kernel. 243 243 */ 244 - pevent_set_long_size(pevent, pevent->header_page_size_size); 244 + tep_set_long_size(pevent, pevent->header_page_size_size); 245 245 } 246 246 free(header_page); 247 247 ··· 439 439 440 440 pevent = tevent->pevent; 441 441 442 - pevent_set_flag(pevent, PEVENT_NSEC_OUTPUT); 443 - pevent_set_file_bigendian(pevent, file_bigendian); 444 - pevent_set_host_bigendian(pevent, host_bigendian); 442 + tep_set_flag(pevent, PEVENT_NSEC_OUTPUT); 443 + tep_set_file_bigendian(pevent, file_bigendian); 444 + tep_set_host_bigendian(pevent, host_bigendian); 445 445 446 446 if (do_read(buf, 1) < 0) 447 447 goto out; ··· 451 451 if (!file_page_size) 452 452 goto out; 453 453 454 - pevent_set_long_size(pevent, file_long_size); 455 - pevent_set_page_size(pevent, file_page_size); 454 + tep_set_long_size(pevent, file_long_size); 455 + tep_set_page_size(pevent, file_page_size); 456 456 457 457 err = read_header_files(pevent); 458 458 if (err)
+4 -4
tools/perf/util/trace-event.c
··· 47 47 return -1; 48 48 49 49 pevent = tevent.pevent; 50 - pevent_set_flag(pevent, PEVENT_NSEC_OUTPUT); 51 - pevent_set_file_bigendian(pevent, be); 52 - pevent_set_host_bigendian(pevent, be); 50 + tep_set_flag(pevent, PEVENT_NSEC_OUTPUT); 51 + tep_set_file_bigendian(pevent, be); 52 + tep_set_host_bigendian(pevent, be); 53 53 tevent_initialized = true; 54 54 return 0; 55 55 } ··· 60 60 if (!tevent_initialized && trace_event__init2()) 61 61 return -1; 62 62 63 - return pevent_set_function_resolver(tevent.pevent, func, machine); 63 + return tep_set_function_resolver(tevent.pevent, func, machine); 64 64 } 65 65 66 66 void trace_event__cleanup(struct trace_event *t)