X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fconsumer-timer.c;h=1408052431aac3613db4e912c505320dd497e1ba;hb=7e66b1b0255bbe6b5a55a83d3ff182ba3d4300ee;hp=0f5d4ba9655d6985a656b069fcb83843d310f3a9;hpb=94d4914075c61cd1ee2ec00d8b61eacff105fc47;p=lttng-tools.git

diff --git a/src/common/consumer-timer.c b/src/common/consumer-timer.c
index 0f5d4ba96..140805243 100644
--- a/src/common/consumer-timer.c
+++ b/src/common/consumer-timer.c
@@ -21,13 +21,15 @@
 #include <inttypes.h>
 #include <signal.h>
 
-#include <lttng/ust-ctl.h>
+#include <bin/lttng-consumerd/health-consumerd.h>
 #include <common/common.h>
+#include <common/compat/endian.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 = {
@@ -112,12 +114,14 @@ static void metadata_switch_timer(struct lttng_consumer_local_data *ctx,
 	}
 }
 
-static int send_empty_index(struct lttng_consumer_stream *stream, uint64_t ts)
+static int send_empty_index(struct lttng_consumer_stream *stream, uint64_t ts,
+		uint64_t stream_id)
 {
 	int ret;
-	struct lttng_packet_index index;
+	struct ctf_packet_index index;
 
 	memset(&index, 0, sizeof(index));
+	index.stream_id = htobe64(stream_id);
 	index.timestamp_end = htobe64(ts);
 	ret = consumer_stream_write_index(stream, &index);
 	if (ret < 0) {
@@ -130,7 +134,7 @@ error:
 
 static int check_kernel_stream(struct lttng_consumer_stream *stream)
 {
-	uint64_t ts;
+	uint64_t ts, stream_id;
 	int ret;
 
 	/*
@@ -153,13 +157,18 @@ static int check_kernel_stream(struct lttng_consumer_stream *stream)
 	}
 	ret = kernctl_snapshot(stream->wait_fd);
 	if (ret < 0) {
-		if (errno != EAGAIN) {
-			ERR("Taking kernel snapshot");
+		if (errno != EAGAIN && errno != ENODATA) {
+			PERROR("live timer kernel snapshot");
 			ret = -1;
 			goto error_unlock;
 		}
+		ret = kernctl_get_stream_id(stream->wait_fd, &stream_id);
+		if (ret < 0) {
+			PERROR("kernctl_get_stream_id");
+			goto error_unlock;
+		}
 		DBG("Stream %" PRIu64 " empty, sending beacon", stream->key);
-		ret = send_empty_index(stream, ts);
+		ret = send_empty_index(stream, ts, stream_id);
 		if (ret < 0) {
 			goto error_unlock;
 		}
@@ -173,7 +182,7 @@ error_unlock:
 
 static int check_ust_stream(struct lttng_consumer_stream *stream)
 {
-	uint64_t ts;
+	uint64_t ts, stream_id;
 	int ret;
 
 	assert(stream);
@@ -191,21 +200,26 @@ 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");
 			ret = -1;
 			goto error_unlock;
 		}
+		ret = lttng_ustconsumer_get_stream_id(stream, &stream_id);
+		if (ret < 0) {
+			PERROR("ustctl_get_stream_id");
+			goto error_unlock;
+		}
 		DBG("Stream %" PRIu64 " empty, sending beacon", stream->key);
-		ret = send_empty_index(stream, ts);
+		ret = send_empty_index(stream, ts, stream_id);
 		if (ret < 0) {
 			goto error_unlock;
 		}
@@ -397,7 +411,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 +484,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");
@@ -495,5 +521,11 @@ void *consumer_timer_thread(void *data)
 		}
 	}
 
+error_testpoint:
+	/* Only reached in testpoint error */
+	health_error();
+	health_unregister(health_consumerd);
+
+	/* Never return */
 	return NULL;
 }