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

diff --git a/src/common/consumer/consumer.c b/src/common/consumer/consumer.c
index 5c211339d..311c64020 100644
--- a/src/common/consumer/consumer.c
+++ b/src/common/consumer/consumer.c
@@ -1583,7 +1583,6 @@ end:
  * Returns the number of bytes written
  */
 ssize_t lttng_consumer_on_read_subbuffer_mmap(
-		struct lttng_consumer_local_data *ctx,
 		struct lttng_consumer_stream *stream,
 		const struct lttng_buffer_view *buffer,
 		unsigned long padding)
@@ -1686,7 +1685,7 @@ ssize_t lttng_consumer_on_read_subbuffer_mmap(
 	 * receive a ret value that is bigger than len.
 	 */
 	ret = lttng_write(outfd, buffer->data, write_len);
-	DBG("Consumer mmap write() ret %zd (len %lu)", ret, write_len);
+	DBG("Consumer mmap write() ret %zd (len %zu)", ret, write_len);
 	if (ret < 0 || ((size_t) ret != write_len)) {
 		/*
 		 * Report error to caller if nothing was written else at least send the
@@ -3315,7 +3314,7 @@ ssize_t lttng_consumer_read_subbuffer(struct lttng_consumer_stream *stream,
 		struct lttng_consumer_local_data *ctx,
 		bool locked_by_caller)
 {
-	ssize_t ret, written_bytes;
+	ssize_t ret, written_bytes = 0;
 	int rotation_ret;
 	struct stream_subbuffer subbuffer = {};
 
@@ -3348,6 +3347,7 @@ ssize_t lttng_consumer_read_subbuffer(struct lttng_consumer_stream *stream,
 		if (ret == -ENODATA) {
 			/* Not an error. */
 			ret = 0;
+			goto sleep_stream;
 		}
 		goto end;
 	}
@@ -3376,8 +3376,8 @@ ssize_t lttng_consumer_read_subbuffer(struct lttng_consumer_stream *stream,
 		 * error.
 		 */
 		DBG("Failed to write to tracefile (written_bytes: %zd != padded subbuffer size: %lu, subbuffer size: %lu)",
-				written_bytes, subbuffer.info.data.subbuf_size,
-				subbuffer.info.data.padded_subbuf_size);
+				written_bytes, subbuffer.info.data.padded_subbuf_size,
+				subbuffer.info.data.subbuf_size);
 	}
 
 	ret = stream->read_subbuffer_ops.put_next_subbuffer(stream, &subbuffer);
@@ -3413,6 +3413,7 @@ ssize_t lttng_consumer_read_subbuffer(struct lttng_consumer_stream *stream,
 		goto end;
 	}
 
+sleep_stream:
 	if (stream->read_subbuffer_ops.on_sleep) {
 		stream->read_subbuffer_ops.on_sleep(stream, ctx);
 	}