X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fconsumer.c;h=2c2b79cf0f501fc864211e1e63b7ec6abc242dbb;hp=da24f81c50a3eac71108d007d3a3d4e5b4124583;hb=309167d2a6f59d0c8cbf64eb23ba912cdea76a34;hpb=efa116c6f19ecdc344a82709e7d919703ec96c45

diff --git a/src/common/consumer.c b/src/common/consumer.c
index da24f81c5..2c2b79cf0 100644
--- a/src/common/consumer.c
+++ b/src/common/consumer.c
@@ -33,6 +33,7 @@
 #include <common/common.h>
 #include <common/utils.h>
 #include <common/compat/poll.h>
+#include <common/index/index.h>
 #include <common/kernel-ctl/kernel-ctl.h>
 #include <common/sessiond-comm/relayd.h>
 #include <common/sessiond-comm/sessiond-comm.h>
@@ -506,6 +507,7 @@ struct lttng_consumer_stream *consumer_allocate_stream(uint64_t channel_key,
 	stream->session_id = session_id;
 	stream->monitor = monitor;
 	stream->endpoint_status = CONSUMER_ENDPOINT_ACTIVE;
+	stream->index_fd = -1;
 	pthread_mutex_init(&stream->lock, NULL);
 
 	/* If channel is the metadata, flag this stream as metadata. */
@@ -1317,7 +1319,8 @@ end:
 ssize_t lttng_consumer_on_read_subbuffer_mmap(
 		struct lttng_consumer_local_data *ctx,
 		struct lttng_consumer_stream *stream, unsigned long len,
-		unsigned long padding)
+		unsigned long padding,
+		struct lttng_packet_index *index)
 {
 	unsigned long mmap_offset;
 	void *mmap_base;
@@ -1424,18 +1427,34 @@ ssize_t lttng_consumer_on_read_subbuffer_mmap(
 			ret = utils_rotate_stream_file(stream->chan->pathname,
 					stream->name, stream->chan->tracefile_size,
 					stream->chan->tracefile_count, stream->uid, stream->gid,
-					stream->out_fd, &(stream->tracefile_count_current));
+					stream->out_fd, &(stream->tracefile_count_current),
+					&stream->out_fd);
 			if (ret < 0) {
 				ERR("Rotating output file");
 				goto end;
 			}
-			outfd = stream->out_fd = ret;
+			outfd = stream->out_fd;
+
+			if (stream->index_fd >= 0) {
+				ret = index_create_file(stream->chan->pathname,
+						stream->name, stream->uid, stream->gid,
+						stream->chan->tracefile_size,
+						stream->tracefile_count_current);
+				if (ret < 0) {
+					goto end;
+				}
+				stream->index_fd = ret;
+			}
+
 			/* Reset current size because we just perform a rotation. */
 			stream->tracefile_size_current = 0;
 			stream->out_fd_offset = 0;
 			orig_offset = 0;
 		}
 		stream->tracefile_size_current += len;
+		if (index) {
+			index->offset = htobe64(stream->out_fd_offset);
+		}
 	}
 
 	while (len > 0) {
@@ -1510,7 +1529,8 @@ end:
 ssize_t lttng_consumer_on_read_subbuffer_splice(
 		struct lttng_consumer_local_data *ctx,
 		struct lttng_consumer_stream *stream, unsigned long len,
-		unsigned long padding)
+		unsigned long padding,
+		struct lttng_packet_index *index)
 {
 	ssize_t ret = 0, written = 0, ret_splice = 0;
 	loff_t offset = 0;
@@ -1610,18 +1630,32 @@ ssize_t lttng_consumer_on_read_subbuffer_splice(
 			ret = utils_rotate_stream_file(stream->chan->pathname,
 					stream->name, stream->chan->tracefile_size,
 					stream->chan->tracefile_count, stream->uid, stream->gid,
-					stream->out_fd, &(stream->tracefile_count_current));
+					stream->out_fd, &(stream->tracefile_count_current),
+					&stream->out_fd);
 			if (ret < 0) {
 				ERR("Rotating output file");
 				goto end;
 			}
-			outfd = stream->out_fd = ret;
+			outfd = stream->out_fd;
+
+			if (stream->index_fd >= 0) {
+				ret = index_create_file(stream->chan->pathname,
+						stream->name, stream->uid, stream->gid,
+						stream->chan->tracefile_size,
+						stream->tracefile_count_current);
+				if (ret < 0) {
+					goto end;
+				}
+				stream->index_fd = ret;
+			}
+
 			/* Reset current size because we just perform a rotation. */
 			stream->tracefile_size_current = 0;
 			stream->out_fd_offset = 0;
 			orig_offset = 0;
 		}
 		stream->tracefile_size_current += len;
+		index->offset = htobe64(stream->out_fd_offset);
 	}
 
 	while (len > 0) {