X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=src%2Flib%2Flttng-ust%2Flttng-ust-statedump.c;h=64294706703b6c0ae6e475120c1ce68da181791c;hb=1f8a8ec9581af89d98aec47de9ad9e25087cd54a;hp=31626f8c5fc4d614f7255f6f47b6159844e964b7;hpb=ac9f44c2c5bebedcaf4e101362efb39b7a158bbd;p=lttng-ust.git

diff --git a/src/lib/lttng-ust/lttng-ust-statedump.c b/src/lib/lttng-ust/lttng-ust-statedump.c
index 31626f8c..64294706 100644
--- a/src/lib/lttng-ust/lttng-ust-statedump.c
+++ b/src/lib/lttng-ust/lttng-ust-statedump.c
@@ -24,11 +24,14 @@
 #include "common/getenv.h"
 #include "lib/lttng-ust/events.h"
 
-#define TRACEPOINT_DEFINE
+#define LTTNG_UST_TRACEPOINT_HIDDEN_DEFINITION
+#define LTTNG_UST_TRACEPOINT_PROVIDER_HIDDEN_DEFINITION
+
+#define LTTNG_UST_TRACEPOINT_DEFINE
 #include "ust_lib.h"				/* Only define. */
 
-#define TRACEPOINT_CREATE_PROBES
-#define TP_SESSION_CHECK
+#define LTTNG_UST_TRACEPOINT_CREATE_PROBES
+#define LTTNG_UST_TP_SESSION_CHECK
 #include "lttng-ust-statedump-provider.h"	/* Define and create probes. */
 
 struct dl_iterate_data {
@@ -60,7 +63,7 @@ struct lttng_ust_dl_node {
 
 #define UST_DL_STATE_HASH_BITS	8
 #define UST_DL_STATE_TABLE_SIZE	(1 << UST_DL_STATE_HASH_BITS)
-struct cds_hlist_head dl_state_table[UST_DL_STATE_TABLE_SIZE];
+static struct cds_hlist_head dl_state_table[UST_DL_STATE_TABLE_SIZE];
 
 typedef void (*tracepoint_cb)(struct lttng_ust_session *session, void *priv);
 
@@ -551,10 +554,10 @@ void lttng_ust_dl_update(void *ip)
 		return;
 
 	/*
-	 * Fixup lttng-ust TLS when called from dlopen/dlclose
-	 * instrumentation.
+	 * Force the allocation of lttng-ust TLS variables when called from
+	 * dlopen/dlclose instrumentation.
 	 */
-	lttng_ust_fixup_tls();
+	lttng_ust_alloc_tls();
 
 	data.exec_found = 0;
 	data.first = true;
@@ -630,7 +633,7 @@ void lttng_ust_statedump_init(void)
 {
 	lttng_ust__tracepoints__init();
 	lttng_ust__tracepoints__ptrs_init();
-	__lttng_ust_events_init__lttng_ust_statedump();
+	lttng_ust__events_init__lttng_ust_statedump();
 	lttng_ust_dl_update(LTTNG_UST_CALLER_IP());
 }
 
@@ -652,7 +655,7 @@ void ust_dl_state_destroy(void)
 
 void lttng_ust_statedump_destroy(void)
 {
-	__lttng_ust_events_exit__lttng_ust_statedump();
+	lttng_ust__events_exit__lttng_ust_statedump();
 	lttng_ust__tracepoints__ptrs_destroy();
 	lttng_ust__tracepoints__destroy();
 	ust_dl_state_destroy();