X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-consumerd%2Flttng-consumerd.c;h=4a9a7a4929200bfd53c838eed13b48f52dd0ae50;hb=748b7b07caecdc5f7ac4a73e008a7d0a84d422c4;hp=2b5528d64cc4385866761e8df7cdef5f3a5dba8d;hpb=e98ec5475c67dd270e7a703011d720ff14ec4ed2;p=lttng-tools.git

diff --git a/src/bin/lttng-consumerd/lttng-consumerd.c b/src/bin/lttng-consumerd/lttng-consumerd.c
index 2b5528d64..4a9a7a492 100644
--- a/src/bin/lttng-consumerd/lttng-consumerd.c
+++ b/src/bin/lttng-consumerd/lttng-consumerd.c
@@ -79,6 +79,8 @@ struct health_app *health_consumerd;
 
 const char *tracing_group_name = DEFAULT_TRACING_GROUP;
 
+int lttng_consumer_ready = NR_LTTNG_CONSUMER_READY;
+
 enum lttng_consumer_type lttng_consumer_get_type(void)
 {
 	if (!ctx) {
@@ -419,6 +421,15 @@ int main(int argc, char **argv)
 		goto health_error;
 	}
 
+	/*
+	 * Wait for health thread to be initialized before letting the
+	 * sessiond thread reply to the sessiond that we are ready.
+	 */
+	while (uatomic_read(&lttng_consumer_ready)) {
+		sleep(1);
+	}
+	cmm_smp_mb();	/* Read ready before following operations */
+
 	/* Create thread to manage channels */
 	ret = pthread_create(&channel_thread, NULL, consumer_thread_channel_poll,
 			(void *) ctx);