X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=src%2Fcommon%2Fconsumer%2Fconsumer.c;h=1b46a707146204e3e823462be801befa5c2853e8;hb=1e2b06e01bb27dffc9a43aab62f5575b1e29a852;hp=86caf6841d43501521ba0a8865402809bfa2d0b8;hpb=6f1177cf8de79015ed38f48749029c81240b0eb6;p=lttng-tools.git

diff --git a/src/common/consumer/consumer.c b/src/common/consumer/consumer.c
index 86caf6841..1b46a7071 100644
--- a/src/common/consumer/consumer.c
+++ b/src/common/consumer/consumer.c
@@ -1584,7 +1584,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)
@@ -1687,7 +1686,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
@@ -3254,7 +3253,7 @@ void *consumer_thread_sessiond_poll(void *data)
 			err = 0;	/* All is OK */
 			goto end;
 		}
-		DBG("received command on sock");
+		DBG("Received command on sock");
 	}
 	/* All is OK */
 	err = 0;
@@ -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);
 	}