X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=lttng-events.c;h=567df65acea12345f51e46c937efa5f95cb15202;hb=e5115bcd95bc2db82bacb382f15b6ded828e39c9;hp=faf3e1f0f8f76785ebcc8b9d0baa170f113817e9;hpb=d83004aa718065e5221d8ef4b99e4302b70b3df9;p=lttng-modules.git

diff --git a/lttng-events.c b/lttng-events.c
index faf3e1f0..567df65a 100644
--- a/lttng-events.c
+++ b/lttng-events.c
@@ -561,8 +561,18 @@ int lttng_metadata_output_channel(struct lttng_channel *chan,
 	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),
 			len);
@@ -577,10 +587,10 @@ int lttng_metadata_output_channel(struct lttng_channel *chan,
 		goto end;
 	}
 	chan->ops->event_write(&ctx,
-			stream->metadata_cache->data + stream->metadata_cache_read,
+			stream->metadata_cache->data + stream->metadata_in,
 			reserve_len);
 	chan->ops->event_commit(&ctx);
-	stream->metadata_cache_read += reserve_len;
+	stream->metadata_in += reserve_len;
 	ret = reserve_len;
 
 end: