X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fconsumer%2Fconsumer.c;h=b2feb3945c8a40f3c1476e4dba7d9b659b8f9f8b;hb=f05a6b6d56e3ff5a7fed1db2ef630665ca6f4c56;hp=e182c991f147baf89bcb482da2ff9b4936d775b6;hpb=f5dbe415fb8c3efcdcd68968b8cc8f40369b9cd9;p=lttng-tools.git

diff --git a/src/common/consumer/consumer.c b/src/common/consumer/consumer.c
index e182c991f..b2feb3945 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,
@@ -66,6 +67,8 @@ struct consumer_channel_msg {
 	uint64_t key;				/* del */
 };
 
+int data_consumption_paused;
+
 /*
  * Flag to inform the polling thread to quit when all fd hung up. Updated by
  * the consumer_thread_receive_fds when it notices that all fds has hung up.
@@ -367,6 +370,9 @@ void consumer_del_channel(struct lttng_consumer_channel *channel)
 	if (channel->live_timer_enabled == 1) {
 		consumer_timer_live_stop(channel);
 	}
+	if (channel->monitor_timer_enabled == 1) {
+		consumer_timer_monitor_stop(channel);
+	}
 
 	switch (consumer_data.type) {
 	case LTTNG_CONSUMER_KERNEL:
@@ -570,7 +576,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);
@@ -1347,6 +1353,8 @@ struct lttng_consumer_local_data *lttng_consumer_create(
 		goto error_metadata_pipe;
 	}
 
+	ctx->channel_monitor_pipe = -1;
+
 	return ctx;
 
 error_metadata_pipe:
@@ -1530,7 +1538,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 +1632,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. */
@@ -1832,22 +1834,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. */
@@ -2064,6 +2060,10 @@ 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->lock);
+	if (stream->chan->metadata_cache) {
+		/* Only applicable to userspace consumers. */
+		pthread_mutex_lock(&stream->chan->metadata_cache->lock);
+	}
 
 	/* Remove any reference to that stream. */
 	consumer_stream_delete(stream, ht);
@@ -2087,6 +2087,9 @@ void consumer_del_metadata_stream(struct lttng_consumer_stream *stream,
 	 */
 	stream->chan->metadata_stream = NULL;
 
+	if (stream->chan->metadata_cache) {
+		pthread_mutex_unlock(&stream->chan->metadata_cache->lock);
+	}
 	pthread_mutex_unlock(&stream->lock);
 	pthread_mutex_unlock(&stream->chan->lock);
 	pthread_mutex_unlock(&consumer_data.lock);
@@ -2374,7 +2377,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.
 					 */
@@ -2401,7 +2404,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.
 						 */
@@ -2529,6 +2532,9 @@ void *consumer_thread_data_poll(void *data)
 		/* poll on the array of fds */
 	restart:
 		DBG("polling on %d fd", nb_fd + 2);
+		if (testpoint(consumerd_thread_data_poll)) {
+			goto end;
+		}
 		health_poll_entry();
 		num_rdy = poll(pollfd, nb_fd + 2, -1);
 		health_poll_exit();