X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fcommon%2Fconsumer%2Fconsumer.c;h=688492e439d0811cc17308667055a5bcc7c3b9d5;hb=611cce88797fd71f50d9bcb6e2921f20b3445ca5;hp=eac37654f244220492185121206892b6d2948d82;hpb=29d1a7ae5d5b46002e5883366a7b06f1d9dcc115;p=lttng-tools.git

diff --git a/src/common/consumer/consumer.c b/src/common/consumer/consumer.c
index eac37654f..688492e43 100644
--- a/src/common/consumer/consumer.c
+++ b/src/common/consumer/consumer.c
@@ -1423,7 +1423,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)
@@ -1545,7 +1544,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
@@ -3147,7 +3146,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;
 	struct stream_subbuffer subbuffer = {};
 
 	if (!locked_by_caller) {
@@ -3166,6 +3165,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;
 	}
@@ -3210,6 +3210,7 @@ ssize_t lttng_consumer_read_subbuffer(struct lttng_consumer_stream *stream,
 		}
 	}
 
+sleep_stream:
 	if (stream->read_subbuffer_ops.on_sleep) {
 		stream->read_subbuffer_ops.on_sleep(stream, ctx);
 	}