X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fmain.c;h=cb9e16ec506e8ffbae652ba4dda670af27a0917d;hb=37317960b40f5c473cff5d6dfad1f667e0109ff1;hp=ec907628dd5628f0bf77752fc0a5752f2c9911dc;hpb=c9d85d295b71b29506d1de4a675e701a51599472;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c
index ec907628d..cb9e16ec5 100644
--- a/src/bin/lttng-sessiond/main.c
+++ b/src/bin/lttng-sessiond/main.c
@@ -4352,8 +4352,17 @@ static void *thread_manage_clients(void *data)
 		if (ret > 0 || (ret < 0 && errno != EINTR)) {
 			goto exit;
 		}
-		cmm_smp_rmb();
 	}
+	/*
+	 * This barrier is paired with the one in sessiond_notify_ready() to
+	 * ensure that loads accessing data initialized by the other threads,
+	 * on which this thread was waiting, are not performed before this point.
+	 *
+	 * Note that this could be a 'read' memory barrier, but a full barrier
+	 * is used in case the code changes. The performance implications of
+	 * this choice are minimal since this is a slow path.
+	 */
+	cmm_smp_mb();
 
 	/* This testpoint is after we signal readiness to the parent. */
 	if (testpoint(sessiond_thread_manage_clients)) {