X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fconsumer.c;h=187c0c30cdf003741f053417e1c9209c64b80713;hb=51a9e1c7f7fd48e2b53e258aee269a69cb8b59d3;hp=2f20ffb5d1d97fb585803d1721bdfeb7e494ffb9;hpb=9ce5646a7ef9b8d7936c46649a21ee546fadd538;p=lttng-tools.git

diff --git a/src/common/consumer.c b/src/common/consumer.c
index 2f20ffb5d..187c0c30c 100644
--- a/src/common/consumer.c
+++ b/src/common/consumer.c
@@ -30,6 +30,7 @@
 #include <inttypes.h>
 #include <signal.h>
 
+#include <bin/lttng-consumerd/health-consumerd.h>
 #include <common/common.h>
 #include <common/utils.h>
 #include <common/compat/poll.h>
@@ -44,7 +45,6 @@
 
 #include "consumer.h"
 #include "consumer-stream.h"
-#include "../bin/lttng-consumerd/health-consumerd.h"
 
 struct lttng_consumer_global_data consumer_data = {
 	.stream_count = 0,
@@ -94,6 +94,18 @@ static void notify_thread_lttng_pipe(struct lttng_pipe *pipe)
 	(void) lttng_pipe_write(pipe, &null_stream, sizeof(null_stream));
 }
 
+static void notify_health_quit_pipe(int *pipe)
+{
+	int ret;
+
+	do {
+		ret = write(pipe[1], "4", 1);
+	} while (ret < 0 && errno == EINTR);
+	if (ret < 0 || ret != 1) {
+		PERROR("write consumer health quit");
+	}
+}
+
 static void notify_channel_pipe(struct lttng_consumer_local_data *ctx,
 		struct lttng_consumer_channel *chan,
 		uint64_t key,
@@ -3121,6 +3133,8 @@ end:
 
 	notify_channel_pipe(ctx, NULL, -1, CONSUMER_CHANNEL_QUIT);
 
+	notify_health_quit_pipe(health_quit_pipe);
+
 	/* Cleaning up possibly open sockets. */
 	if (sock >= 0) {
 		ret = close(sock);