X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=lttng-events.c;h=4b891cd5ecda22e8778f5a4592f19c9e2574172f;hb=78c8710bb8e6b7f6301d95afec0305f40fa063ad;hp=faf3e1f0f8f76785ebcc8b9d0baa170f113817e9;hpb=d83004aa718065e5221d8ef4b99e4302b70b3df9;p=lttng-modules.git

diff --git a/lttng-events.c b/lttng-events.c
index faf3e1f0..4b891cd5 100644
--- a/lttng-events.c
+++ b/lttng-events.c
@@ -554,33 +554,43 @@ void _lttng_event_destroy(struct lttng_event *event)
  * remaining space left in packet and write, since mutual exclusion
  * protects us from concurrent writes.
  */
-int lttng_metadata_output_channel(struct lttng_channel *chan,
-		struct lttng_metadata_stream *stream)
+int lttng_metadata_output_channel(struct lttng_metadata_stream *stream,
+		struct channel *chan)
 {
 	struct lib_ring_buffer_ctx ctx;
 	int ret = 0;
 	size_t len, reserve_len;
 
+	/*
+	 * Ensure we support mutiple get_next / put sequences followed
+	 * by put_next.
+	 */
+	WARN_ON(stream->metadata_in < stream->metadata_out);
+	if (stream->metadata_in != stream->metadata_out)
+		return 0;
+
 	len = stream->metadata_cache->metadata_written -
-		stream->metadata_cache_read;
+		stream->metadata_in;
+	if (!len)
+		return 0;
 	reserve_len = min_t(size_t,
-			chan->ops->packet_avail_size(chan->chan),
+			stream->transport->ops.packet_avail_size(chan),
 			len);
-	lib_ring_buffer_ctx_init(&ctx, chan->chan, NULL, reserve_len,
+	lib_ring_buffer_ctx_init(&ctx, chan, NULL, reserve_len,
 			sizeof(char), -1);
 	/*
 	 * If reservation failed, return an error to the caller.
 	 */
-	ret = chan->ops->event_reserve(&ctx, 0);
+	ret = stream->transport->ops.event_reserve(&ctx, 0);
 	if (ret != 0) {
 		printk(KERN_WARNING "LTTng: Metadata event reservation failed\n");
 		goto end;
 	}
-	chan->ops->event_write(&ctx,
-			stream->metadata_cache->data + stream->metadata_cache_read,
+	stream->transport->ops.event_write(&ctx,
+			stream->metadata_cache->data + stream->metadata_in,
 			reserve_len);
-	chan->ops->event_commit(&ctx);
-	stream->metadata_cache_read += reserve_len;
+	stream->transport->ops.event_commit(&ctx);
+	stream->metadata_in += reserve_len;
 	ret = reserve_len;
 
 end: