X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fmain.c;h=5664b0be1e86c46e4c2d4f4b1e42250fb30cee8e;hp=bf5adc50130c6609bb9239542d3153941def70fa;hb=26c9d55e1367d3aff6e501b5a1295edd1ccbc210;hpb=44a5e5eb99f1d8b528f83fda5585677a3882f5f5

diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c
index bf5adc501..5664b0be1 100644
--- a/src/bin/lttng-sessiond/main.c
+++ b/src/bin/lttng-sessiond/main.c
@@ -44,6 +44,7 @@
 #include <common/kernel-consumer/kernel-consumer.h>
 #include <common/futex.h>
 #include <common/relayd/relayd.h>
+#include <common/utils.h>
 
 #include "lttng-sessiond.h"
 #include "channel.h"
@@ -102,6 +103,7 @@ static struct consumer_data ustconsumer32_data = {
 	.cmd_sock = -1,
 };
 
+/* Shared between threads */
 static int dispatch_thread_exit;
 
 /* Global application Unix socket path */
@@ -419,7 +421,7 @@ static void stop_threads(void)
 	}
 
 	/* Dispatch thread */
-	dispatch_thread_exit = 1;
+	CMM_STORE_SHARED(dispatch_thread_exit, 1);
 	futex_nto1_wake(&ust_cmd_queue.futex);
 }
 
@@ -1218,7 +1220,7 @@ static void *thread_dispatch_ust_registration(void *data)
 
 	DBG("[thread] Dispatch UST command started");
 
-	while (!dispatch_thread_exit) {
+	while (!CMM_LOAD_SHARED(dispatch_thread_exit)) {
 		/* Atomically prepare the queue futex */
 		futex_nto1_prepare(&ust_cmd_queue.futex);
 
@@ -1956,25 +1958,12 @@ static int send_socket_relayd_consumer(int domain, struct ltt_session *session,
 		session->net_handle = 1;
 	}
 
-	switch (domain) {
-	case LTTNG_DOMAIN_KERNEL:
-		/* Send relayd socket to consumer. */
-		ret = kernel_consumer_send_relayd_socket(consumer_fd, sock,
-				consumer, relayd_uri->stype);
-		if (ret < 0) {
-			ret = LTTCOMM_ENABLE_CONSUMER_FAIL;
-			goto close_sock;
-		}
-		break;
-	case LTTNG_DOMAIN_UST:
-		/* Send relayd socket to consumer. */
-		ret = ust_consumer_send_relayd_socket(consumer_fd, sock,
-				consumer, relayd_uri->stype);
-		if (ret < 0) {
-			ret = LTTCOMM_ENABLE_CONSUMER_FAIL;
-			goto close_sock;
-		}
-		break;
+	/* Send relayd socket to consumer. */
+	ret = consumer_send_relayd_socket(consumer_fd, sock,
+			consumer, relayd_uri->stype);
+	if (ret < 0) {
+		ret = LTTCOMM_ENABLE_CONSUMER_FAIL;
+		goto close_sock;
 	}
 
 	ret = LTTCOMM_OK;