X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fconsumer%2Fconsumer-stream.c;h=1e3bfe7853f905addf8cee2efbefb3ccd6f9446f;hp=8c21d6ae1edd3afe71967d6bf5e5cb32cb998675;hb=2932b393f5e79a6d57f0126778372ed286348a96;hpb=503fefca8a1b82cfafccaa096e900c41bf4570f6

diff --git a/src/common/consumer/consumer-stream.c b/src/common/consumer/consumer-stream.c
index 8c21d6ae1..1e3bfe785 100644
--- a/src/common/consumer/consumer-stream.c
+++ b/src/common/consumer/consumer-stream.c
@@ -152,9 +152,40 @@ static ssize_t consumer_stream_consume_mmap(
 	const unsigned long padding_size =
 			subbuffer->info.data.padded_subbuf_size -
 			subbuffer->info.data.subbuf_size;
-
-	return lttng_consumer_on_read_subbuffer_mmap(
+	const ssize_t written_bytes = lttng_consumer_on_read_subbuffer_mmap(
 			stream, &subbuffer->buffer.buffer, padding_size);
+
+	if (stream->net_seq_idx == -1ULL) {
+		/*
+		 * When writing on disk, check that only the subbuffer (no
+		 * padding) was written to disk.
+		 */
+		if (written_bytes != subbuffer->info.data.padded_subbuf_size) {
+			DBG("Failed to write the entire padded subbuffer on disk (written_bytes: %zd, padded subbuffer size %lu)",
+					written_bytes,
+					subbuffer->info.data.padded_subbuf_size);
+		}
+	} else {
+		/*
+		 * When streaming over the network, check that the entire
+		 * subbuffer including padding was successfully written.
+		 */
+		if (written_bytes != subbuffer->info.data.subbuf_size) {
+			DBG("Failed to write only the subbuffer over the network (written_bytes: %zd, subbuffer size %lu)",
+					written_bytes,
+					subbuffer->info.data.subbuf_size);
+		}
+	}
+
+	/*
+	 * If `lttng_consumer_on_read_subbuffer_mmap()` returned an error, pass
+	 * it along to the caller, else return zero.
+	 */
+	if (written_bytes < 0) {
+		ERR("Error reading mmap subbuffer: %zd", written_bytes);
+	}
+
+	return written_bytes;
 }
 
 static ssize_t consumer_stream_consume_splice(
@@ -162,8 +193,24 @@ static ssize_t consumer_stream_consume_splice(
 		struct lttng_consumer_stream *stream,
 		const struct stream_subbuffer *subbuffer)
 {
-	return lttng_consumer_on_read_subbuffer_splice(ctx, stream,
-			subbuffer->info.data.padded_subbuf_size, 0);
+	const ssize_t written_bytes = lttng_consumer_on_read_subbuffer_splice(
+			ctx, stream, subbuffer->info.data.padded_subbuf_size, 0);
+
+	if (written_bytes != subbuffer->info.data.padded_subbuf_size) {
+		DBG("Failed to write the entire padded subbuffer (written_bytes: %zd, padded subbuffer size %lu)",
+				written_bytes,
+				subbuffer->info.data.padded_subbuf_size);
+	}
+
+	/*
+	 * If `lttng_consumer_on_read_subbuffer_splice()` returned an error,
+	 * pass it along to the caller, else return zero.
+	 */
+	if (written_bytes < 0) {
+		ERR("Error reading splice subbuffer: %zd", written_bytes);
+	}
+
+	return written_bytes;
 }
 
 static int consumer_stream_send_index(
@@ -1103,16 +1150,16 @@ int consumer_stream_create_output_files(struct lttng_consumer_stream *stream,
 			goto end;
 		}
 		stream->out_fd = -1;
-        }
+	}
 
 	DBG("Opening stream output file \"%s\"", stream_path);
 	chunk_status = lttng_trace_chunk_open_file(stream->trace_chunk, stream_path,
 			flags, mode, &stream->out_fd, false);
-        if (chunk_status != LTTNG_TRACE_CHUNK_STATUS_OK) {
+	if (chunk_status != LTTNG_TRACE_CHUNK_STATUS_OK) {
 		ERR("Failed to open stream file \"%s\"", stream->name);
 		ret = -1;
 		goto end;
-        }
+	}
 
 	if (!stream->metadata_flag && (create_index || stream->index_file)) {
 		if (stream->index_file) {