X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fconsumer-timer.c;h=1408052431aac3613db4e912c505320dd497e1ba;hb=70190e1c2ba092cd35a9e0b53c0ce8a6bf260d50;hp=b681ae763379deaa55d68da8f6113b7b99b87eb3;hpb=50adc26400482c07210afcda8ef1d3322f75871d;p=lttng-tools.git

diff --git a/src/common/consumer-timer.c b/src/common/consumer-timer.c
index b681ae763..140805243 100644
--- a/src/common/consumer-timer.c
+++ b/src/common/consumer-timer.c
@@ -23,11 +23,13 @@
 
 #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 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);
@@ -204,8 +213,13 @@ static int check_ust_stream(struct lttng_consumer_stream *stream)
 			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;
 		}
@@ -472,6 +486,10 @@ void *consumer_timer_thread(void *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. */
@@ -503,7 +521,9 @@ void *consumer_timer_thread(void *data)
 		}
 	}
 
-	/* Currently never reached */
+error_testpoint:
+	/* Only reached in testpoint error */
+	health_error();
 	health_unregister(health_consumerd);
 
 	/* Never return */