X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fbin%2Flttng-consumerd%2Fhealth-consumerd.c;h=fc9a266653f2361efe3a4987bd2640e125761d8c;hb=fd20dac985126e84929d657f5a1042222c7d5017;hp=413df9acfb92eff3ad4e3566708c7709edd6fe24;hpb=dbc8403ddf4274527a5be169978d5f08991c9501;p=lttng-tools.git

diff --git a/src/bin/lttng-consumerd/health-consumerd.c b/src/bin/lttng-consumerd/health-consumerd.c
index 413df9acf..fc9a26665 100644
--- a/src/bin/lttng-consumerd/health-consumerd.c
+++ b/src/bin/lttng-consumerd/health-consumerd.c
@@ -16,6 +16,7 @@
  */
 
 #define _GNU_SOURCE
+#define _LGPL_SOURCE
 #include <fcntl.h>
 #include <getopt.h>
 #include <grp.h>
@@ -233,6 +234,10 @@ void *thread_manage_health(void *data)
 		goto error;
 	}
 
+	/* Perform prior memory accesses before decrementing ready */
+	cmm_smp_mb__before_uatomic_dec();
+	uatomic_dec(&lttng_consumer_ready);
+
 	while (1) {
 		DBG("Health check ready");
 
@@ -256,6 +261,11 @@ restart:
 			revents = LTTNG_POLL_GETEV(&events, i);
 			pollfd = LTTNG_POLL_GETFD(&events, i);
 
+			if (!revents) {
+				/* No activity for this FD (poll implementation). */
+				continue;
+			}
+
 			/* Thread quit pipe has been closed. Killing thread. */
 			ret = check_health_quit_pipe(pollfd, revents);
 			if (ret) {
@@ -299,7 +309,7 @@ restart:
 
 		assert(msg.cmd == HEALTH_CMD_CHECK);
 
-		reply.ret_code = 0;
+		memset(&reply, 0, sizeof(reply));
 		for (i = 0; i < NR_HEALTH_CONSUMERD_TYPES; i++) {
 			/*
 			 * health_check_state return 0 if thread is in
@@ -310,7 +320,7 @@ restart:
 			}
 		}
 
-		DBG2("Health check return value %" PRIx64, reply.ret_code);
+		DBG("Health check return value %" PRIx64, reply.ret_code);
 
 		ret = send_unix_sock(new_sock, (void *) &reply, sizeof(reply));
 		if (ret < 0) {