X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fconsumer-timer.c;h=b867a35bf0d6e9d44da62698fa366f7e06bd2d70;hb=6e92aae66f50ea02a78aecc72bead32bcd3dbac4;hp=e2be05e7e731b8355235e3d040365545c5828bbc;hpb=d3e2ba59faddb31870e2ce29b6a881f7ad5ad883;p=lttng-tools.git

diff --git a/src/common/consumer-timer.c b/src/common/consumer-timer.c
index e2be05e7e..b867a35bf 100644
--- a/src/common/consumer-timer.c
+++ b/src/common/consumer-timer.c
@@ -21,13 +21,14 @@
 #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>
 #include <common/consumer-stream.h>
 
 #include "consumer-timer.h"
+#include "consumer-testpoint.h"
 #include "ust-consumer/ust-consumer.h"
 
 static struct timer_signal_data timer_signal = {
@@ -100,7 +101,7 @@ static void metadata_switch_timer(struct lttng_consumer_local_data *ctx,
 		 * they are held while consumer_timer_switch_stop() is
 		 * called.
 		 */
-		ret = lttng_ustconsumer_request_metadata(ctx, channel, 1);
+		ret = lttng_ustconsumer_request_metadata(ctx, channel, 1, 1);
 		if (ret < 0) {
 			channel->switch_timer_error = 1;
 		}
@@ -115,7 +116,7 @@ static void metadata_switch_timer(struct lttng_consumer_local_data *ctx,
 static int send_empty_index(struct lttng_consumer_stream *stream, uint64_t ts)
 {
 	int ret;
-	struct lttng_packet_index index;
+	struct ctf_packet_index index;
 
 	memset(&index, 0, sizeof(index));
 	index.timestamp_end = htobe64(ts);
@@ -186,15 +187,20 @@ static int check_ust_stream(struct lttng_consumer_stream *stream)
 	 * safely send the empty index.
 	 */
 	pthread_mutex_lock(&stream->lock);
-	ret = ustctl_get_current_timestamp(stream->ustream, &ts);
+	ret = cds_lfht_is_node_deleted(&stream->node.node);
+	if (ret) {
+		goto error_unlock;
+	}
+
+	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 (errno != EAGAIN) {
+		if (ret != -EAGAIN) {
 			ERR("Taking UST snapshot");
 			ret = -1;
 			goto error_unlock;
@@ -392,7 +398,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;
 	}
 
@@ -465,12 +471,24 @@ 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);
+
+	if (testpoint(consumerd_thread_metadata_timer)) {
+		goto error_testpoint;
+	}
+
+	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");
@@ -490,5 +508,11 @@ void *consumer_timer_thread(void *data)
 		}
 	}
 
+error_testpoint:
+	/* Only reached in testpoint error */
+	health_error();
+	health_unregister(health_consumerd);
+
+	/* Never return */
 	return NULL;
 }