X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Flib%2Fringbuffer%2Fring_buffer_iterator.c;h=da19d28053dca4bb7c700d7c390b04ab5405a331;hb=d410bc8d04b373105d94a884fedd07c93c92b741;hp=64fc50861b062ba8ba988a7a51f013a407154ccb;hpb=5a15f70c5211ff4a398171a6971586e2948eb419;p=lttng-modules.git

diff --git a/src/lib/ringbuffer/ring_buffer_iterator.c b/src/lib/ringbuffer/ring_buffer_iterator.c
index 64fc5086..da19d280 100644
--- a/src/lib/ringbuffer/ring_buffer_iterator.c
+++ b/src/lib/ringbuffer/ring_buffer_iterator.c
@@ -46,7 +46,7 @@ restart:
 	switch (iter->state) {
 	case ITER_GET_SUBBUF:
 		ret = lib_ring_buffer_get_next_subbuf(buf);
-		if (ret && !READ_ONCE(buf->finalized)
+		if (ret && !LTTNG_READ_ONCE(buf->finalized)
 		    && config->alloc == RING_BUFFER_ALLOC_GLOBAL) {
 			/*
 			 * Use "pull" scheme for global buffers. The reader
@@ -105,6 +105,24 @@ restart:
 }
 EXPORT_SYMBOL_GPL(lib_ring_buffer_get_next_record);
 
+void lib_ring_buffer_put_current_record(struct lib_ring_buffer *buf)
+{
+	struct lib_ring_buffer_iter *iter;
+
+	if (!buf)
+		return;
+	iter = &buf->iter;
+	if (iter->state != ITER_NEXT_RECORD)
+		return;
+	iter->read_offset += iter->payload_len;
+	iter->state = ITER_TEST_RECORD;
+	if (iter->read_offset - iter->consumed >= iter->data_size) {
+		lib_ring_buffer_put_next_subbuf(buf);
+		iter->state = ITER_GET_SUBBUF;
+	}
+}
+EXPORT_SYMBOL_GPL(lib_ring_buffer_put_current_record);
+
 static int buf_is_higher(void *a, void *b)
 {
 	struct lib_ring_buffer *bufa = a;
@@ -696,12 +714,14 @@ skip_get_next:
 			return -EFAULT;
 		}
 		read_count += copy_len;
-	};
-	return read_count;
+	}
+	goto put_record;
 
 nodata:
 	*ppos = 0;
 	chan->iter.len_left = 0;
+put_record:
+	lib_ring_buffer_put_current_record(buf);
 	return read_count;
 }