X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fkernel-consumer%2Fkernel-consumer.c;h=bb95529530161b4a45152609a67f8f018eeca6bd;hb=6bf73bf53464ad309fcf7f02a4dc397d280b81f8;hp=87436371fd693dc7b94004eddfe5e576a1618fa1;hpb=10a8a2237343699e3923d87e24dbf2d7fe225377;p=lttng-tools.git

diff --git a/src/common/kernel-consumer/kernel-consumer.c b/src/common/kernel-consumer/kernel-consumer.c
index 87436371f..bb9552953 100644
--- a/src/common/kernel-consumer/kernel-consumer.c
+++ b/src/common/kernel-consumer/kernel-consumer.c
@@ -29,9 +29,8 @@
 #include <sys/types.h>
 #include <unistd.h>
 
+#include <common/common.h>
 #include <common/kernel-ctl/kernel-ctl.h>
-#include <common/lttngerr.h>
-#include <common/runas.h>
 #include <common/sessiond-comm/sessiond-comm.h>
 
 #include "kernel-consumer.h"
@@ -58,7 +57,7 @@ int lttng_kconsumer_on_read_subbuffer_mmap(
 	/* get the offset inside the fd to mmap */
 	ret = kernctl_get_mmap_read_offset(fd, &mmap_offset);
 	if (ret != 0) {
-		ret = -errno;
+		errno = -ret;
 		perror("kernctl_get_mmap_read_offset");
 		goto end;
 	}
@@ -68,7 +67,7 @@ int lttng_kconsumer_on_read_subbuffer_mmap(
 		if (ret >= len) {
 			len = 0;
 		} else if (ret < 0) {
-			ret = -errno;
+			errno = -ret;
 			perror("Error in file write");
 			goto end;
 		}
@@ -108,7 +107,7 @@ int lttng_kconsumer_on_read_subbuffer_splice(
 				SPLICE_F_MOVE | SPLICE_F_MORE);
 		DBG("splice chan to pipe ret %ld", ret);
 		if (ret < 0) {
-			ret = errno;
+			errno = -ret;
 			perror("Error in relay splice");
 			goto splice_error;
 		}
@@ -117,7 +116,7 @@ int lttng_kconsumer_on_read_subbuffer_splice(
 				SPLICE_F_MOVE | SPLICE_F_MORE);
 		DBG("splice pipe to file %ld", ret);
 		if (ret < 0) {
-			ret = errno;
+			errno = -ret;
 			perror("Error in file splice");
 			goto splice_error;
 		}
@@ -165,7 +164,7 @@ int lttng_kconsumer_take_snapshot(struct lttng_consumer_local_data *ctx,
 
 	ret = kernctl_snapshot(infd);
 	if (ret != 0) {
-		ret = errno;
+		errno = -ret;
 		perror("Getting sub-buffer snapshot.");
 	}
 
@@ -187,7 +186,7 @@ int lttng_kconsumer_get_produced_snapshot(
 
 	ret = kernctl_snapshot_get_produced(infd, pos);
 	if (ret != 0) {
-		ret = errno;
+		errno = -ret;
 		perror("kernctl_snapshot_get_produced");
 	}
 
@@ -320,7 +319,6 @@ int lttng_kconsumer_read_subbuffer(struct lttng_consumer_stream *stream,
 	/* Get the next subbuffer */
 	err = kernctl_get_next_subbuf(infd);
 	if (err != 0) {
-		ret = errno;
 		/*
 		 * This is a debug message even for single-threaded consumer,
 		 * because poll() have more relaxed criterions than get subbuf,
@@ -337,7 +335,7 @@ int lttng_kconsumer_read_subbuffer(struct lttng_consumer_stream *stream,
 			/* read the whole subbuffer */
 			err = kernctl_get_padded_subbuf_size(infd, &len);
 			if (err != 0) {
-				ret = errno;
+				errno = -ret;
 				perror("Getting sub-buffer len failed.");
 				goto end;
 			}
@@ -356,7 +354,7 @@ int lttng_kconsumer_read_subbuffer(struct lttng_consumer_stream *stream,
 			/* read the used subbuffer size */
 			err = kernctl_get_padded_subbuf_size(infd, &len);
 			if (err != 0) {
-				ret = errno;
+				errno = -ret;
 				perror("Getting sub-buffer len failed.");
 				goto end;
 			}
@@ -377,7 +375,7 @@ int lttng_kconsumer_read_subbuffer(struct lttng_consumer_stream *stream,
 
 	err = kernctl_put_next_subbuf(infd);
 	if (err != 0) {
-		ret = errno;
+		errno = -ret;
 		if (errno == EFAULT) {
 			perror("Error in unreserving sub buffer\n");
 		} else if (errno == EIO) {
@@ -415,7 +413,7 @@ int lttng_kconsumer_on_recv_stream(struct lttng_consumer_stream *stream)
 
 		ret = kernctl_get_mmap_len(stream->wait_fd, &mmap_len);
 		if (ret != 0) {
-			ret = errno;
+			errno = -ret;
 			perror("kernctl_get_mmap_len");
 			goto error_close_fd;
 		}