X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fkernel-consumer%2Fkernel-consumer.c;h=f910f033d9ea96e283f3ee5705e6cf9d599efef8;hp=cd814b8a7f92d5e482d1fd142fb3a6d2dbb68e8c;hb=91dfef6e2f50460b9597fc8a8186949c48557c14;hpb=1d4dfdefb6efe31cd6436931f893caf7b05d0223;ds=sidebyside

diff --git a/src/common/kernel-consumer/kernel-consumer.c b/src/common/kernel-consumer/kernel-consumer.c
index cd814b8a7..f910f033d 100644
--- a/src/common/kernel-consumer/kernel-consumer.c
+++ b/src/common/kernel-consumer/kernel-consumer.c
@@ -337,8 +337,12 @@ ssize_t lttng_kconsumer_read_subbuffer(struct lttng_consumer_stream *stream,
 		padding = 0;
 
 		/* splice the subbuffer to the tracefile */
-		ret = lttng_consumer_on_read_subbuffer_splice(ctx, stream,
-				subbuf_size, padding);
+		ret = lttng_consumer_on_read_subbuffer_splice(ctx, stream, subbuf_size,
+				padding);
+		/*
+		 * XXX: Splice does not support network streaming so the return value
+		 * is simply checked against subbuf_size and not like the mmap() op.
+		 */
 		if (ret != subbuf_size) {
 			/*
 			 * display the error but continue processing to try
@@ -364,15 +368,22 @@ ssize_t lttng_kconsumer_read_subbuffer(struct lttng_consumer_stream *stream,
 		padding = len - subbuf_size;
 
 		/* write the subbuffer to the tracefile */
-		ret = lttng_consumer_on_read_subbuffer_mmap(ctx, stream,
-				subbuf_size, padding);
-		if (ret != subbuf_size) {
+		ret = lttng_consumer_on_read_subbuffer_mmap(ctx, stream, subbuf_size,
+				padding);
+		/*
+		 * The mmap operation should write subbuf_size amount of data when
+		 * network streaming or the full padding (len) size when we are _not_
+		 * streaming.
+		 */
+		if ((ret != subbuf_size && stream->net_seq_idx != -1) ||
+				(ret != len && stream->net_seq_idx == -1)) {
 			/*
-			 * display the error but continue processing to try
-			 * to release the subbuffer
+			 * Display the error but continue processing to try to release the
+			 * subbuffer
 			 */
-			ERR("Error writing to tracefile (ret: %zd != len: %lu",
-					ret, subbuf_size);
+			ERR("Error writing to tracefile "
+					"(ret: %zd != len: %lu != subbuf_size: %lu)",
+					ret, len, subbuf_size);
 		}
 		break;
 	default: