X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=liblttng-ust%2Flttng-ust-comm.c;h=19ce0ceba780b3aa1c1070244e2207544eb7839d;hb=25afb7acba09668c22c9709ff344c4dd92bad1e2;hp=25de5dd5535a3f25ee4b15e8d9ac709152bf4cf1;hpb=4c41b460614826ada066a7e0c26a8b116336bab2;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-ust-comm.c b/liblttng-ust/lttng-ust-comm.c
index 25de5dd5..19ce0ceb 100644
--- a/liblttng-ust/lttng-ust-comm.c
+++ b/liblttng-ust/lttng-ust-comm.c
@@ -34,6 +34,7 @@
 #include <lttng/ust.h>
 #include <lttng/ust-error.h>
 #include <lttng/ust-ctl.h>
+#include <lttng/ust-libc-wrapper.h>
 #include <urcu/tls-compat.h>
 #include <ust-comm.h>
 #include <ust-fd.h>
@@ -2052,7 +2053,7 @@ quit:
  * Weak symbol to call when the ust malloc wrapper is not loaded.
  */
 __attribute__((weak))
-void lttng_ust_malloc_wrapper_init(void)
+void lttng_ust_libc_wrapper_malloc_init(void)
 {
 }
 
@@ -2109,7 +2110,7 @@ void __attribute__((constructor)) lttng_ust_init(void)
 	 */
 	ust_err_init();
 	lttng_ust_getenv_init();	/* Needs ust_err_init() to be completed. */
-	init_tracepoint();
+	lttng_ust_tp_init();
 	lttng_ust_init_fd_tracker();
 	lttng_ust_clock_init();
 	lttng_ust_getcpu_init();
@@ -2125,7 +2126,7 @@ void __attribute__((constructor)) lttng_ust_init(void)
 	/*
 	 * Invoke ust malloc wrapper init before starting other threads.
 	 */
-	lttng_ust_malloc_wrapper_init();
+	lttng_ust_libc_wrapper_malloc_init();
 
 	timeout_mode = get_constructor_timeout(&constructor_timeout);
 
@@ -2269,7 +2270,7 @@ void lttng_ust_cleanup(int exiting)
 	lttng_counter_client_percpu_32_modular_exit();
 	lttng_counter_client_percpu_64_modular_exit();
 	lttng_ust_statedump_destroy();
-	exit_tracepoint();
+	lttng_ust_tp_exit();
 	if (!exiting) {
 		/* Reinitialize values for fork */
 		sem_count = sem_count_initial_value;