X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fconsumer.c;h=0661f1264fa0e7fa136a9b4772f302558287ab56;hb=3c4599b9a5c12ceff19368c6cd51e01d81824726;hp=7acb8560ca4e07bfdccc89518477dad6a8d79051;hpb=e5d1a9b33aa0920bbd9f6948bd0676156da67c61;p=lttng-tools.git

diff --git a/src/common/consumer.c b/src/common/consumer.c
index 7acb8560c..0661f1264 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. */
@@ -837,7 +839,8 @@ struct lttng_consumer_channel *consumer_allocate_channel(uint64_t key,
 		uint64_t tracefile_size,
 		uint64_t tracefile_count,
 		uint64_t session_id_per_pid,
-		unsigned int monitor)
+		unsigned int monitor,
+		unsigned int live_timer_interval)
 {
 	struct lttng_consumer_channel *channel;
 
@@ -858,6 +861,7 @@ struct lttng_consumer_channel *consumer_allocate_channel(uint64_t key,
 	channel->tracefile_size = tracefile_size;
 	channel->tracefile_count = tracefile_count;
 	channel->monitor = monitor;
+	channel->live_timer_interval = live_timer_interval;
 	pthread_mutex_init(&channel->lock, NULL);
 	pthread_mutex_init(&channel->timer_lock, NULL);
 
@@ -1317,7 +1321,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 +1429,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 +1531,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 +1632,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) {
@@ -2197,11 +2233,6 @@ restart:
 			revents = LTTNG_POLL_GETEV(&events, i);
 			pollfd = LTTNG_POLL_GETFD(&events, i);
 
-			/* Just don't waste time if no returned events for the fd */
-			if (!revents) {
-				continue;
-			}
-
 			if (pollfd == lttng_pipe_get_readfd(ctx->consumer_metadata_pipe)) {
 				if (revents & (LPOLLERR | LPOLLHUP )) {
 					DBG("Metadata thread pipe hung up");