From 14227bde84a144ed425a12d47337ade48e50bd4e Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Fri, 23 Apr 2021 14:13:45 -0400 Subject: [PATCH] Rename lttng_ust_tracepoint_(un)register_lib Change-Id: I15d84c682da4ce98ca872f36a765ab8db22c1dcc Signed-off-by: Michael Jeanson Signed-off-by: Mathieu Desnoyers --- include/lttng/tracepoint.h | 20 ++++++++++---------- src/lib/lttng-ust-tracepoint/tracepoint.c | 12 ++++++------ 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/include/lttng/tracepoint.h b/include/lttng/tracepoint.h index 045046af..f2a65777 100644 --- a/include/lttng/tracepoint.h +++ b/include/lttng/tracepoint.h @@ -252,9 +252,9 @@ struct lttng_ust_tracepoint_dlopen { void *liblttngust_handle; - int (*lttng_ust_tracepoint_register_lib)(struct lttng_ust_tracepoint * const *tracepoints_start, + int (*lttng_ust_tracepoint_module_register)(struct lttng_ust_tracepoint * const *tracepoints_start, int tracepoints_count); - int (*lttng_ust_tracepoint_unregister_lib)(struct lttng_ust_tracepoint * const *tracepoints_start); + int (*lttng_ust_tracepoint_module_unregister)(struct lttng_ust_tracepoint * const *tracepoints_start); void (*rcu_read_lock_sym)(void); void (*rcu_read_unlock_sym)(void); void *(*rcu_dereference_sym)(void *p); @@ -525,14 +525,14 @@ lttng_ust__tracepoints__ptrs_init(void) return; if (!lttng_ust_tracepoint_destructors_syms_ptr) lttng_ust_tracepoint_destructors_syms_ptr = <tng_ust_tracepoint_destructors_syms; - lttng_ust_tracepoint_dlopen_ptr->lttng_ust_tracepoint_register_lib = + lttng_ust_tracepoint_dlopen_ptr->lttng_ust_tracepoint_module_register = URCU_FORCE_CAST(int (*)(struct lttng_ust_tracepoint * const *, int), dlsym(lttng_ust_tracepoint_dlopen_ptr->liblttngust_handle, - "lttng_ust_tracepoint_register_lib")); - lttng_ust_tracepoint_dlopen_ptr->lttng_ust_tracepoint_unregister_lib = + "lttng_ust_tracepoint_module_register")); + lttng_ust_tracepoint_dlopen_ptr->lttng_ust_tracepoint_module_unregister = URCU_FORCE_CAST(int (*)(struct lttng_ust_tracepoint * const *), dlsym(lttng_ust_tracepoint_dlopen_ptr->liblttngust_handle, - "lttng_ust_tracepoint_unregister_lib")); + "lttng_ust_tracepoint_module_unregister")); lttng_ust_tracepoint_destructors_syms_ptr->tracepoint_disable_destructors = URCU_FORCE_CAST(void (*)(void), dlsym(lttng_ust_tracepoint_dlopen_ptr->liblttngust_handle, @@ -542,8 +542,8 @@ lttng_ust__tracepoints__ptrs_init(void) dlsym(lttng_ust_tracepoint_dlopen_ptr->liblttngust_handle, "lttng_ust_tp_get_destructors_state")); lttng_ust_tracepoint__init_urcu_sym(); - if (lttng_ust_tracepoint_dlopen_ptr->lttng_ust_tracepoint_register_lib) { - lttng_ust_tracepoint_dlopen_ptr->lttng_ust_tracepoint_register_lib(__start_lttng_ust_tracepoints_ptrs, + if (lttng_ust_tracepoint_dlopen_ptr->lttng_ust_tracepoint_module_register) { + lttng_ust_tracepoint_dlopen_ptr->lttng_ust_tracepoint_module_register(__start_lttng_ust_tracepoints_ptrs, __stop_lttng_ust_tracepoints_ptrs - __start_lttng_ust_tracepoints_ptrs); } @@ -563,8 +563,8 @@ lttng_ust__tracepoints__ptrs_destroy(void) lttng_ust_tracepoint_dlopen_ptr = <tng_ust_tracepoint_dlopen; if (!lttng_ust_tracepoint_destructors_syms_ptr) lttng_ust_tracepoint_destructors_syms_ptr = <tng_ust_tracepoint_destructors_syms; - if (lttng_ust_tracepoint_dlopen_ptr->lttng_ust_tracepoint_unregister_lib) - lttng_ust_tracepoint_dlopen_ptr->lttng_ust_tracepoint_unregister_lib(__start_lttng_ust_tracepoints_ptrs); + if (lttng_ust_tracepoint_dlopen_ptr->lttng_ust_tracepoint_module_unregister) + lttng_ust_tracepoint_dlopen_ptr->lttng_ust_tracepoint_module_unregister(__start_lttng_ust_tracepoints_ptrs); if (lttng_ust_tracepoint_dlopen_ptr->liblttngust_handle && lttng_ust_tracepoint_destructors_syms_ptr->tracepoint_get_destructors_state && lttng_ust_tracepoint_destructors_syms_ptr->tracepoint_get_destructors_state() diff --git a/src/lib/lttng-ust-tracepoint/tracepoint.c b/src/lib/lttng-ust-tracepoint/tracepoint.c index 9767b15c..38d57cec 100644 --- a/src/lib/lttng-ust-tracepoint/tracepoint.c +++ b/src/lib/lttng-ust-tracepoint/tracepoint.c @@ -74,8 +74,8 @@ static CDS_LIST_HEAD(libs); * The tracepoint mutex protects the library tracepoints, the hash table, and * the library list. * All calls to the tracepoint API must be protected by the tracepoint mutex, - * excepts calls to lttng_ust_tracepoint_register_lib and - * lttng_ust_tracepoint_unregister_lib, which take the tracepoint mutex themselves. + * excepts calls to lttng_ust_tracepoint_module_register and + * lttng_ust_tracepoint_module_unregister, which take the tracepoint mutex themselves. */ /* @@ -877,9 +877,9 @@ static void new_tracepoints(struct lttng_ust_tracepoint * const *start, * against recent liblttng-ust headers require a recent liblttng-ust * runtime for those tracepoints to be taken into account. */ -int lttng_ust_tracepoint_register_lib(struct lttng_ust_tracepoint * const *tracepoints_start, +int lttng_ust_tracepoint_module_register(struct lttng_ust_tracepoint * const *tracepoints_start, int tracepoints_count); -int lttng_ust_tracepoint_register_lib(struct lttng_ust_tracepoint * const *tracepoints_start, +int lttng_ust_tracepoint_module_register(struct lttng_ust_tracepoint * const *tracepoints_start, int tracepoints_count) { struct tracepoint_lib *pl, *iter; @@ -932,8 +932,8 @@ lib_added: return 0; } -int lttng_ust_tracepoint_unregister_lib(struct lttng_ust_tracepoint * const *tracepoints_start); -int lttng_ust_tracepoint_unregister_lib(struct lttng_ust_tracepoint * const *tracepoints_start) +int lttng_ust_tracepoint_module_unregister(struct lttng_ust_tracepoint * const *tracepoints_start); +int lttng_ust_tracepoint_module_unregister(struct lttng_ust_tracepoint * const *tracepoints_start) { struct tracepoint_lib *lib; -- 2.34.1