X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=liblttng-ust%2Flttng-ust-statedump.c;h=f40b7195af4f9474d946609192423a22f8fbd76f;hb=refs%2Fheads%2FC009-19;hp=644af303aa9ceae55bae10d899571d8999e02b26;hpb=8002ea62058fd7e44575f7056a26c6b257948d03;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-ust-statedump.c b/liblttng-ust/lttng-ust-statedump.c
index 644af303..f40b7195 100644
--- a/liblttng-ust/lttng-ust-statedump.c
+++ b/liblttng-ust/lttng-ust-statedump.c
@@ -34,6 +34,7 @@
 #include "lttng-tracer-core.h"
 #include "lttng-ust-statedump.h"
 #include "jhash.h"
+#include "getenv.h"
 
 #define TRACEPOINT_DEFINE
 #include "ust_lib.h"				/* Only define. */
@@ -413,6 +414,8 @@ void iter_end(struct dl_iterate_data *data, void *ip)
 {
 	unsigned int i;
 
+	if (data->cancel)
+		goto end;
 	/*
 	 * Iterate on hash table.
 	 * For each marked, traced, do nothing.
@@ -440,6 +443,7 @@ void iter_end(struct dl_iterate_data *data, void *ip)
 			}
 		}
 	}
+end:
 	ust_unlock();
 }
 
@@ -548,9 +552,15 @@ void lttng_ust_dl_update(void *ip)
 {
 	struct dl_iterate_data data;
 
-	if (getenv("LTTNG_UST_WITHOUT_BADDR_STATEDUMP"))
+	if (lttng_getenv("LTTNG_UST_WITHOUT_BADDR_STATEDUMP"))
 		return;
 
+	/*
+	 * Fixup lttng-ust TLS when called from dlopen/dlclose
+	 * instrumentation.
+	 */
+	lttng_ust_fixup_tls();
+
 	data.exec_found = 0;
 	data.first = true;
 	data.cancel = false;
@@ -576,7 +586,7 @@ void lttng_ust_dl_update(void *ip)
 static
 int do_baddr_statedump(void *owner)
 {
-	if (getenv("LTTNG_UST_WITHOUT_BADDR_STATEDUMP"))
+	if (lttng_getenv("LTTNG_UST_WITHOUT_BADDR_STATEDUMP"))
 		return 0;
 	lttng_ust_dl_update(LTTNG_UST_CALLER_IP());
 	ust_dl_table_statedump(owner);