X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=src%2Fcommon%2Fconsumer%2Fconsumer.c;h=782ace930c0f7c6cb4952c703202a8fcea4b5e1f;hb=56c86e0a3f16a2f7fd3e473dd8c9d753a13e86ee;hp=a2e7238d490ac7d417efc87aa9993b0e7314a57e;hpb=e537f276fd9688b701f52b8e5da438ee6aea4306;p=lttng-tools.git

diff --git a/src/common/consumer/consumer.c b/src/common/consumer/consumer.c
index a2e7238d4..782ace930 100644
--- a/src/common/consumer/consumer.c
+++ b/src/common/consumer/consumer.c
@@ -3500,24 +3500,10 @@ ssize_t lttng_consumer_read_subbuffer(struct lttng_consumer_stream *stream,
 
 	written_bytes = stream->read_subbuffer_ops.consume_subbuffer(
 			ctx, stream, &subbuffer);
-	/*
-	 * Should write subbuf_size amount of data when network streaming or
-	 * the full padded size when we are not streaming.
-	 */
-	if ((written_bytes != subbuffer.info.data.subbuf_size &&
-			    stream->net_seq_idx != (uint64_t) -1ULL) ||
-			(written_bytes != subbuffer.info.data.padded_subbuf_size &&
-					stream->net_seq_idx ==
-							(uint64_t) -1ULL)) {
-		/*
-		 * Display the error but continue processing to try to
-		 * release the subbuffer. This is a DBG statement
-		 * since this can happen without being a critical
-		 * error.
-		 */
-		DBG("Failed to write to tracefile (written_bytes: %zd != padded subbuffer size: %lu, subbuffer size: %lu)",
-				written_bytes, subbuffer.info.data.padded_subbuf_size,
-				subbuffer.info.data.subbuf_size);
+	if (written_bytes <= 0) {
+		ERR("Error consuming subbuffer: (%zd)", written_bytes);
+		ret = (int) written_bytes;
+		goto error_put_subbuf;
 	}
 
 	ret = stream->read_subbuffer_ops.put_next_subbuffer(stream, &subbuffer);
@@ -4362,7 +4348,7 @@ int lttng_consumer_rotate_channel(struct lttng_consumer_channel *channel,
 		case OPEN_PACKET_STATUS_ERROR:
 			/* Logged by callee. */
 			ret = -1;
-			goto end_unlock_stream;
+			goto end_unlock_channel;
 		default:
 			abort();
 		}