X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fkernel-consumer%2Fkernel-consumer.c;h=315af2eb86e540900ad08496b6b0cff83fef4804;hp=09ccda329526b69cf1e5aa147ed32f4dc8a67e81;hb=1c20f0e29cbf8627bfb1ff444572d52d6655c4e2;hpb=309167d2a6f59d0c8cbf64eb23ba912cdea76a34

diff --git a/src/common/kernel-consumer/kernel-consumer.c b/src/common/kernel-consumer/kernel-consumer.c
index 09ccda329..315af2eb8 100644
--- a/src/common/kernel-consumer/kernel-consumer.c
+++ b/src/common/kernel-consumer/kernel-consumer.c
@@ -462,7 +462,8 @@ int lttng_kconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
 				msg.u.channel.relayd_id, msg.u.channel.output,
 				msg.u.channel.tracefile_size,
 				msg.u.channel.tracefile_count, 0,
-				msg.u.channel.monitor);
+				msg.u.channel.monitor,
+				msg.u.channel.live_timer_interval);
 		if (new_channel == NULL) {
 			lttng_consumer_send_error(ctx, LTTCOMM_CONSUMERD_OUTFD_ERROR);
 			goto end_nosignal;
@@ -906,18 +907,13 @@ ssize_t lttng_kconsumer_read_subbuffer(struct lttng_consumer_stream *stream,
 		struct lttng_consumer_local_data *ctx)
 {
 	unsigned long len, subbuf_size, padding;
-	int err, write_index = 0;
+	int err, write_index = 1;
 	ssize_t ret = 0;
 	int infd = stream->wait_fd;
 	struct lttng_packet_index index;
 
 	DBG("In read_subbuffer (infd : %d)", infd);
 
-	/* Indicate that for this stream we have to write the index. */
-	if (stream->index_fd >= 0) {
-		write_index = 1;
-	}
-
 	/* Get the next subbuffer */
 	err = kernctl_get_next_subbuf(infd);
 	if (err != 0) {
@@ -941,11 +937,13 @@ ssize_t lttng_kconsumer_read_subbuffer(struct lttng_consumer_stream *stream,
 		goto end;
 	}
 
-	if (!stream->metadata_flag && write_index) {
+	if (!stream->metadata_flag) {
 		ret = get_index_values(&index, infd);
 		if (ret < 0) {
 			goto end;
 		}
+	} else {
+		write_index = 0;
 	}
 
 	switch (stream->chan->output) {
@@ -1027,12 +1025,13 @@ ssize_t lttng_kconsumer_read_subbuffer(struct lttng_consumer_stream *stream,
 	}
 
 	/* Write index if needed. */
-	if (write_index) {
-		err = index_write(stream->index_fd, &index, sizeof(index));
-		if (err < 0) {
-			ret = -1;
-			goto end;
-		}
+	if (!write_index) {
+		goto end;
+	}
+
+	err = consumer_stream_write_index(stream, &index);
+	if (err < 0) {
+		goto end;
 	}
 
 end: