X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=liblttng-ust%2Flttng-ust-comm.c;h=1815801a8fe08a06df22b6d1614efc969ca75b4d;hb=49365f4b706194cafe75d8b759554bf9de743c1d;hp=86cce18d57fe658588db907ed8016f39e95f975f;hpb=08114193d6fd56309b520ae50e7117b8bc7f34a5;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-ust-comm.c b/liblttng-ust/lttng-ust-comm.c
index 86cce18d..1815801a 100644
--- a/liblttng-ust/lttng-ust-comm.c
+++ b/liblttng-ust/lttng-ust-comm.c
@@ -46,6 +46,7 @@
 #include "tracepoint-internal.h"
 #include "ltt-tracer-core.h"
 #include "compat.h"
+#include "../libringbuffer/tlsfixup.h"
 
 /*
  * Has lttng ust comm constructor been called ?
@@ -284,28 +285,30 @@ end:
 		//lur.ret_code = USTCOMM_SESSION_FAIL;
 		lur.ret_code = ret;
 	}
-	switch (lum->cmd) {
-	case LTTNG_UST_STREAM:
-		/*
-		 * Special-case reply to send stream info.
-		 * Use lum.u output.
-		 */
-		lur.u.stream.memory_map_size = *args.stream.memory_map_size;
-		shm_fd = *args.stream.shm_fd;
-		wait_fd = *args.stream.wait_fd;
-		break;
-	case LTTNG_UST_METADATA:
-	case LTTNG_UST_CHANNEL:
-		lur.u.channel.memory_map_size = *args.channel.memory_map_size;
-		shm_fd = *args.channel.shm_fd;
-		wait_fd = *args.channel.wait_fd;
-		break;
-	case LTTNG_UST_TRACER_VERSION:
-		lur.u.version = lum->u.version;
-		break;
-	case LTTNG_UST_TRACEPOINT_LIST_GET:
-		memcpy(&lur.u.tracepoint, &lum->u.tracepoint, sizeof(lur.u.tracepoint));
-		break;
+	if (ret >= 0) {
+		switch (lum->cmd) {
+		case LTTNG_UST_STREAM:
+			/*
+			 * Special-case reply to send stream info.
+			 * Use lum.u output.
+			 */
+			lur.u.stream.memory_map_size = *args.stream.memory_map_size;
+			shm_fd = *args.stream.shm_fd;
+			wait_fd = *args.stream.wait_fd;
+			break;
+		case LTTNG_UST_METADATA:
+		case LTTNG_UST_CHANNEL:
+			lur.u.channel.memory_map_size = *args.channel.memory_map_size;
+			shm_fd = *args.channel.shm_fd;
+			wait_fd = *args.channel.wait_fd;
+			break;
+		case LTTNG_UST_TRACER_VERSION:
+			lur.u.version = lum->u.version;
+			break;
+		case LTTNG_UST_TRACEPOINT_LIST_GET:
+			memcpy(&lur.u.tracepoint, &lum->u.tracepoint, sizeof(lur.u.tracepoint));
+			break;
+		}
 	}
 	ret = send_reply(sock, &lur);
 	if (ret < 0) {
@@ -825,6 +828,15 @@ void __attribute__((constructor)) lttng_ust_init(void)
 	if (uatomic_xchg(&initialized, 1) == 1)
 		return;
 
+	/*
+	 * Fixup interdependency between TLS fixup mutex (which happens
+	 * to be the dynamic linker mutex) and ust_lock, taken within
+	 * the ust lock.
+	 */
+	lttng_fixup_event_tls();
+	lttng_fixup_ringbuffer_tls();
+	lttng_fixup_vtid_tls();
+
 	/*
 	 * We want precise control over the order in which we construct
 	 * our sub-libraries vs starting to receive commands from