X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=src%2Fcommon%2Fkernel-consumer%2Fkernel-consumer.c;h=245f4ee46ee552eb60c75b7ca17156ed7ebd8d71;hb=bc93eeca040cab99277daf1bffe87416b62e2532;hp=c0d8e09720b1c3409fda2fb315f1b79d8ca98068;hpb=27585b307a10773445cb3e94b49295ff56e2efdf;p=lttng-tools.git

diff --git a/src/common/kernel-consumer/kernel-consumer.c b/src/common/kernel-consumer/kernel-consumer.c
index c0d8e0972..245f4ee46 100644
--- a/src/common/kernel-consumer/kernel-consumer.c
+++ b/src/common/kernel-consumer/kernel-consumer.c
@@ -403,16 +403,12 @@ static int lttng_kconsumer_snapshot_metadata(
 
 		ret_read = lttng_consumer_read_subbuffer(metadata_stream, ctx, true);
 		if (ret_read < 0) {
-			if (ret_read != -EAGAIN) {
-				ERR("Kernel snapshot reading metadata subbuffer (ret: %zd)",
-						ret_read);
-				ret = ret_read;
-				goto error_snapshot;
-			}
-			/* ret_read is negative at this point so we will exit the loop. */
-			continue;
+			ERR("Kernel snapshot reading metadata subbuffer (ret: %zd)",
+					ret_read);
+			ret = ret_read;
+			goto error_snapshot;
 		}
-	} while (ret_read >= 0);
+	} while (ret_read > 0);
 
 	if (use_relayd) {
 		close_relayd_stream(metadata_stream);
@@ -1531,6 +1527,17 @@ int get_subbuffer_common(struct lttng_consumer_stream *stream,
 
 	ret = kernctl_get_next_subbuf(stream->wait_fd);
 	if (ret) {
+		/*
+		 * The caller only expects -ENODATA when there is no data to
+		 * read, but the kernel tracer returns -EAGAIN when there is
+		 * currently no data for a non-finalized stream, and -ENODATA
+		 * when there is no data for a finalized stream. Those can be
+		 * combined into a -ENODATA return value.
+		 */
+		if (ret == -EAGAIN) {
+			ret = -ENODATA;
+		}
+
 		goto end;
 	}
 
@@ -1612,6 +1619,16 @@ int get_next_subbuffer_metadata_check(struct lttng_consumer_stream *stream,
 			subbuffer->info.metadata.padded_subbuf_size,
 			coherent ? "true" : "false");
 end:
+	/*
+	 * The caller only expects -ENODATA when there is no data to read, but
+	 * the kernel tracer returns -EAGAIN when there is currently no data
+	 * for a non-finalized stream, and -ENODATA when there is no data for a
+	 * finalized stream. Those can be combined into a -ENODATA return value.
+	 */
+	if (ret == -EAGAIN) {
+		ret = -ENODATA;
+	}
+
 	return ret;
 }