X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fconsumer%2Fconsumer-stream.c;h=deebb58fe41b321cb5f41a76e4ee771c1b5ced4d;hp=5dc380e5e32aa9a23c6d75c878bb6d2a3e10086d;hb=f5ba75b4f0c0b44092c76bc931b25b24a2e62718;hpb=6f9449c22eef59294cf1e1dc3610a5cbf14baec0

diff --git a/src/common/consumer/consumer-stream.c b/src/common/consumer/consumer-stream.c
index 5dc380e5e..deebb58fe 100644
--- a/src/common/consumer/consumer-stream.c
+++ b/src/common/consumer/consumer-stream.c
@@ -21,6 +21,7 @@
 #include <common/utils.h>
 #include <common/consumer/consumer.h>
 #include <common/consumer/consumer-timer.h>
+#include <common/consumer/metadata-bucket.h>
 
 #include "consumer-stream.h"
 
@@ -153,7 +154,7 @@ static ssize_t consumer_stream_consume_mmap(
 			subbuffer->info.data.subbuf_size;
 
 	return lttng_consumer_on_read_subbuffer_mmap(
-			ctx, stream, &subbuffer->buffer.buffer, padding_size);
+			stream, &subbuffer->buffer.buffer, padding_size);
 }
 
 static ssize_t consumer_stream_consume_splice(
@@ -395,6 +396,10 @@ int metadata_stream_check_version(struct lttng_consumer_stream *stream,
 	stream->metadata_version = subbuffer->info.metadata.version;
 	stream->reset_metadata_flag = 1;
 
+	if (stream->metadata_bucket) {
+		metadata_bucket_reset(stream->metadata_bucket);
+	}
+
 	if (stream->read_subbuffer_ops.reset_metadata) {
 		stream->read_subbuffer_ops.reset_metadata(stream);
 	}
@@ -726,6 +731,7 @@ void consumer_stream_free(struct lttng_consumer_stream *stream)
 {
 	assert(stream);
 
+	metadata_bucket_destroy(stream->metadata_bucket);
 	call_rcu(&stream->node.head, free_stream_rcu);
 }
 
@@ -991,3 +997,59 @@ bool consumer_stream_is_deleted(struct lttng_consumer_stream *stream)
 	assert(stream);
 	return cds_lfht_is_node_deleted(&stream->node.node);
 }
+
+static ssize_t metadata_bucket_flush(
+		const struct stream_subbuffer *buffer, void *data)
+{
+	ssize_t ret;
+	struct lttng_consumer_stream *stream = data;
+
+	ret = consumer_stream_consume_mmap(NULL, stream, buffer);
+	if (ret < 0) {
+		goto end;
+	}
+end:
+	return ret;
+}
+
+static ssize_t metadata_bucket_consume(
+		struct lttng_consumer_local_data *unused,
+		struct lttng_consumer_stream *stream,
+		const struct stream_subbuffer *subbuffer)
+{
+	ssize_t ret;
+	enum metadata_bucket_status status;
+
+	status = metadata_bucket_fill(stream->metadata_bucket, subbuffer);
+	switch (status) {
+	case METADATA_BUCKET_STATUS_OK:
+		/* Return consumed size. */
+		ret = subbuffer->buffer.buffer.size;
+		break;
+	default:
+		ret = -1;
+	}
+
+	return ret;
+}
+
+int consumer_stream_enable_metadata_bucketization(
+		struct lttng_consumer_stream *stream)
+{
+	int ret = 0;
+
+	assert(stream->metadata_flag);
+	assert(!stream->metadata_bucket);
+	assert(stream->chan->output == CONSUMER_CHANNEL_MMAP);
+
+	stream->metadata_bucket = metadata_bucket_create(
+			metadata_bucket_flush, stream);
+	if (!stream->metadata_bucket) {
+		ret = -1;
+		goto end;
+	}
+
+	stream->read_subbuffer_ops.consume_subbuffer = metadata_bucket_consume;
+end:
+	return ret;
+}