X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fconsumer%2Fconsumer.c;h=54a0531d5ee80cc87a390d581e796b38c88ced85;hp=8945cb07a043f66ec267a0157dd21bce7807d78f;hb=5feafd413038626a47de89c0b29e41673b68818a;hpb=5199ffc42ddba932175270f7620664358bd1e18f

diff --git a/src/common/consumer/consumer.c b/src/common/consumer/consumer.c
index 8945cb07a..54a0531d5 100644
--- a/src/common/consumer/consumer.c
+++ b/src/common/consumer/consumer.c
@@ -47,6 +47,7 @@
 #include <common/consumer/consumer-stream.h>
 #include <common/consumer/consumer-testpoint.h>
 #include <common/align.h>
+#include <common/consumer/consumer-metadata-cache.h>
 
 struct lttng_consumer_global_data consumer_data = {
 	.stream_count = 0,
@@ -570,7 +571,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;
+	stream->index_file = NULL;
 	stream->last_sequence_number = -1ULL;
 	pthread_mutex_init(&stream->lock, NULL);
 	pthread_mutex_init(&stream->metadata_timer_lock, NULL);
@@ -1530,7 +1531,6 @@ ssize_t lttng_consumer_on_read_subbuffer_mmap(
 		mmap_base = stream->mmap_base;
 		ret = kernctl_get_mmap_read_offset(stream->wait_fd, &mmap_offset);
 		if (ret < 0) {
-			ret = -errno;
 			PERROR("tracer ctl get_mmap_read_offset");
 			goto end;
 		}
@@ -1625,21 +1625,16 @@ ssize_t lttng_consumer_on_read_subbuffer_mmap(
 			}
 			outfd = stream->out_fd;
 
-			if (stream->index_fd >= 0) {
-				ret = close(stream->index_fd);
-				if (ret < 0) {
-					PERROR("Closing index");
-					goto end;
-				}
-				stream->index_fd = -1;
-				ret = index_create_file(stream->chan->pathname,
+			if (stream->index_file) {
+				lttng_index_file_put(stream->index_file);
+				stream->index_file = lttng_index_file_create(stream->chan->pathname,
 						stream->name, stream->uid, stream->gid,
 						stream->chan->tracefile_size,
-						stream->tracefile_count_current);
-				if (ret < 0) {
+						stream->tracefile_count_current,
+						CTF_INDEX_MAJOR, CTF_INDEX_MINOR);
+				if (!stream->index_file) {
 					goto end;
 				}
-				stream->index_fd = ret;
 			}
 
 			/* Reset current size because we just perform a rotation. */
@@ -1692,8 +1687,8 @@ ssize_t lttng_consumer_on_read_subbuffer_mmap(
 		lttng_sync_file_range(outfd, stream->out_fd_offset, len,
 				SYNC_FILE_RANGE_WRITE);
 		stream->out_fd_offset += len;
+		lttng_consumer_sync_trace_file(stream, orig_offset);
 	}
-	lttng_consumer_sync_trace_file(stream, orig_offset);
 
 write_error:
 	/*
@@ -1832,22 +1827,16 @@ ssize_t lttng_consumer_on_read_subbuffer_splice(
 			}
 			outfd = stream->out_fd;
 
-			if (stream->index_fd >= 0) {
-				ret = close(stream->index_fd);
-				if (ret < 0) {
-					PERROR("Closing index");
-					goto end;
-				}
-				stream->index_fd = -1;
-				ret = index_create_file(stream->chan->pathname,
+			if (stream->index_file) {
+				lttng_index_file_put(stream->index_file);
+				stream->index_file = lttng_index_file_create(stream->chan->pathname,
 						stream->name, stream->uid, stream->gid,
 						stream->chan->tracefile_size,
-						stream->tracefile_count_current);
-				if (ret < 0) {
-					written = ret;
+						stream->tracefile_count_current,
+						CTF_INDEX_MAJOR, CTF_INDEX_MINOR);
+				if (!stream->index_file) {
 					goto end;
 				}
-				stream->index_fd = ret;
 			}
 
 			/* Reset current size because we just perform a rotation. */
@@ -1922,7 +1911,9 @@ ssize_t lttng_consumer_on_read_subbuffer_splice(
 		stream->output_written += ret_splice;
 		written += ret_splice;
 	}
-	lttng_consumer_sync_trace_file(stream, orig_offset);
+	if (!relayd) {
+		lttng_consumer_sync_trace_file(stream, orig_offset);
+	}
 	goto end;
 
 write_error:
@@ -2061,6 +2052,7 @@ void consumer_del_metadata_stream(struct lttng_consumer_stream *stream,
 
 	pthread_mutex_lock(&consumer_data.lock);
 	pthread_mutex_lock(&stream->chan->lock);
+	pthread_mutex_lock(&stream->chan->metadata_cache->lock);
 	pthread_mutex_lock(&stream->lock);
 
 	/* Remove any reference to that stream. */
@@ -2086,6 +2078,7 @@ void consumer_del_metadata_stream(struct lttng_consumer_stream *stream,
 	stream->chan->metadata_stream = NULL;
 
 	pthread_mutex_unlock(&stream->lock);
+	pthread_mutex_unlock(&stream->chan->metadata_cache->lock);
 	pthread_mutex_unlock(&stream->chan->lock);
 	pthread_mutex_unlock(&consumer_data.lock);
 
@@ -2372,7 +2365,7 @@ restart:
 					len = ctx->on_buffer_ready(stream, ctx);
 					/*
 					 * We don't check the return value here since if we get
-					 * a negative len, it means an error occured thus we
+					 * a negative len, it means an error occurred thus we
 					 * simply remove it from the poll set and free the
 					 * stream.
 					 */
@@ -2399,7 +2392,7 @@ restart:
 						len = ctx->on_buffer_ready(stream, ctx);
 						/*
 						 * We don't check the return value here since if we get
-						 * a negative len, it means an error occured thus we
+						 * a negative len, it means an error occurred thus we
 						 * simply remove it from the poll set and free the
 						 * stream.
 						 */