X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fcommon%2Fconsumer-timer.c;h=1571d86de78b95437d7f7ab833af79129a6b39e2;hb=51a9e1c7f7fd48e2b53e258aee269a69cb8b59d3;hp=0f5d4ba9655d6985a656b069fcb83843d310f3a9;hpb=94d4914075c61cd1ee2ec00d8b61eacff105fc47;p=lttng-tools.git

diff --git a/src/common/consumer-timer.c b/src/common/consumer-timer.c
index 0f5d4ba96..1571d86de 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>
@@ -191,13 +191,13 @@ static int check_ust_stream(struct lttng_consumer_stream *stream)
 		goto error_unlock;
 	}
 
-	ret = ustctl_get_current_timestamp(stream->ustream, &ts);
+	ret = lttng_ustconsumer_get_current_timestamp(stream, &ts);
 	if (ret < 0) {
 		ERR("Failed to get the current timestamp");
 		goto error_unlock;
 	}
-	ustctl_flush_buffer(stream->ustream, 1);
-	ret = ustctl_snapshot(stream->ustream);
+	lttng_ustconsumer_flush_buffer(stream, 1);
+	ret = lttng_ustconsumer_take_snapshot(stream);
 	if (ret < 0) {
 		if (ret != -EAGAIN) {
 			ERR("Taking UST snapshot");
@@ -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;
 }