From: Michael Jeanson <mjeanson@efficios.com>
Date: Wed, 10 Mar 2021 22:07:57 +0000 (-0500)
Subject: Namespace tracepoint_init and tracepoint_exit
X-Git-Tag: v2.13.0-rc1~313
X-Git-Url: http://git.lttng.org/?a=commitdiff_plain;h=25afb7acba09668c22c9709ff344c4dd92bad1e2;p=lttng-ust.git

Namespace tracepoint_init and tracepoint_exit

These are ABI symbols of liblttng-ust-tracepoint, namespace them under
'lttng_ust_tp_'.

Change-Id: Ic9fe173cd475179444a2a680e2e3eaba6622cbef
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---

diff --git a/liblttng-ust/lttng-ust-comm.c b/liblttng-ust/lttng-ust-comm.c
index a5902681..19ce0ceb 100644
--- a/liblttng-ust/lttng-ust-comm.c
+++ b/liblttng-ust/lttng-ust-comm.c
@@ -2110,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();
@@ -2270,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;
diff --git a/liblttng-ust/tracepoint-internal.h b/liblttng-ust/tracepoint-internal.h
index aeb878a1..18705e8b 100644
--- a/liblttng-ust/tracepoint-internal.h
+++ b/liblttng-ust/tracepoint-internal.h
@@ -32,8 +32,8 @@ extern int __tracepoint_probe_unregister_queue_release(const char *name,
 		void (*func)(void), void *data);
 extern void __tracepoint_probe_prune_release_queue(void);
 
-extern void init_tracepoint(void);
-extern void exit_tracepoint(void);
+void lttng_ust_tp_init(void);
+void lttng_ust_tp_exit(void);
 
 void *lttng_ust_tp_check_weak_hidden1(void);
 void *lttng_ust_tp_check_weak_hidden2(void);
diff --git a/liblttng-ust/tracepoint.c b/liblttng-ust/tracepoint.c
index d84f6a7d..adb3f015 100644
--- a/liblttng-ust/tracepoint.c
+++ b/liblttng-ust/tracepoint.c
@@ -864,7 +864,7 @@ int tracepoint_register_lib(struct lttng_ust_tracepoint * const *tracepoints_sta
 {
 	struct tracepoint_lib *pl, *iter;
 
-	init_tracepoint();
+	lttng_ust_tp_init();
 
 	pl = (struct tracepoint_lib *) zmalloc(sizeof(struct tracepoint_lib));
 	if (!pl) {
@@ -956,7 +956,7 @@ static void check_weak_hidden(void)
 			"DIFFERENT addresses");
 }
 
-void init_tracepoint(void)
+void lttng_ust_tp_init(void)
 {
 	if (uatomic_xchg(&initialized, 1) == 1)
 		return;
@@ -964,7 +964,7 @@ void init_tracepoint(void)
 	check_weak_hidden();
 }
 
-void exit_tracepoint(void)
+void lttng_ust_tp_exit(void)
 {
 	initialized = 0;
 }