X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fconsumer-timer.c;h=b97cb28443a99232550de4d543b2607896452ead;hb=3d229795de7f38cce87d6d5ea76ef413dbb71f1d;hp=05a09c2349af27aacf9b4332387e53d29de579f1;hpb=84a182ce022e128395c8d1e5762883f5825582d7;p=lttng-tools.git

diff --git a/src/common/consumer-timer.c b/src/common/consumer-timer.c
index 05a09c234..b97cb2844 100644
--- a/src/common/consumer-timer.c
+++ b/src/common/consumer-timer.c
@@ -21,7 +21,7 @@
 #include <inttypes.h>
 #include <signal.h>
 
-#include <lttng/ust-ctl.h>
+#include <bin/lttng-consumerd/health-consumerd.h>
 #include <common/common.h>
 #include <common/kernel-ctl/kernel-ctl.h>
 #include <common/kernel-consumer/kernel-consumer.h>
@@ -397,7 +397,7 @@ void consumer_timer_live_start(struct lttng_consumer_channel *channel,
 	assert(channel);
 	assert(channel->key);
 
-	if (live_timer_interval == 0) {
+	if (live_timer_interval <= 0) {
 		return;
 	}
 
@@ -470,12 +470,20 @@ void *consumer_timer_thread(void *data)
 	siginfo_t info;
 	struct lttng_consumer_local_data *ctx = data;
 
+	health_register(health_consumerd, HEALTH_CONSUMERD_TYPE_METADATA_TIMER);
+
+	health_code_update();
+
 	/* Only self thread will receive signal mask. */
 	setmask(&mask);
 	CMM_STORE_SHARED(timer_signal.tid, pthread_self());
 
 	while (1) {
+		health_code_update();
+
+		health_poll_entry();
 		signr = sigwaitinfo(&mask, &info);
+		health_poll_exit();
 		if (signr == -1) {
 			if (errno != EINTR) {
 				PERROR("sigwaitinfo");
@@ -495,5 +503,9 @@ void *consumer_timer_thread(void *data)
 		}
 	}
 
+	/* Currently never reached */
+	health_unregister(health_consumerd);
+
+	/* Never return */
 	return NULL;
 }