X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Flib%2Flttng-ust%2Flttng-ust-statedump.c;h=309a98fa2201243913dbf09fcc16c8e2ae134338;hb=2ebb27909ba460be6b58e24750e1cd55b12729df;hp=1251c3bd9e2aac90f39215631fa40ce61d63f040;hpb=cbc06a3bd9abe653eaf278cdf4be8bf28dcca267;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 1251c3bd..309a98fa 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);
 
@@ -420,10 +423,10 @@ void iter_end(struct dl_iterate_data *data, void *ip)
 	 */
 	for (i = 0; i < UST_DL_STATE_TABLE_SIZE; i++) {
 		struct cds_hlist_head *head;
-		struct lttng_ust_dl_node *e;
+		struct lttng_ust_dl_node *e, *tmp;
 
 		head = &dl_state_table[i];
-		cds_hlist_for_each_entry_2(e, head, node) {
+		cds_hlist_for_each_entry_safe_2(e, tmp, head, node) {
 			if (e->marked) {
 				if (!e->traced) {
 					trace_lib_load(&e->bin_data, ip);
@@ -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;
@@ -628,9 +631,9 @@ int do_lttng_ust_statedump(void *owner)
 
 void lttng_ust_statedump_init(void)
 {
-	__tracepoints__init();
-	__tracepoints__ptrs_init();
-	__lttng_ust_events_init__lttng_ust_statedump();
+	lttng_ust__tracepoints__init();
+	lttng_ust__tracepoints__ptrs_init();
+	lttng_ust__events_init__lttng_ust_statedump();
 	lttng_ust_dl_update(LTTNG_UST_CALLER_IP());
 }
 
@@ -652,8 +655,8 @@ void ust_dl_state_destroy(void)
 
 void lttng_ust_statedump_destroy(void)
 {
-	__lttng_ust_events_exit__lttng_ust_statedump();
-	__tracepoints__ptrs_destroy();
-	__tracepoints__destroy();
+	lttng_ust__events_exit__lttng_ust_statedump();
+	lttng_ust__tracepoints__ptrs_destroy();
+	lttng_ust__tracepoints__destroy();
 	ust_dl_state_destroy();
 }