X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fconsumer.c;h=59207da2f2f99f03a27b8a014f682025b03e39f7;hb=3757b38542c2ce30ee7319a85662153de08e7f9a;hp=4b657f33249f7a4f777b7b3ff784b379b15f5878;hpb=6a00837f8cb0431a2ad90974d67fae138ea97dd5;p=lttng-tools.git

diff --git a/src/common/consumer.c b/src/common/consumer.c
index 4b657f332..59207da2f 100644
--- a/src/common/consumer.c
+++ b/src/common/consumer.c
@@ -1334,6 +1334,7 @@ ssize_t lttng_consumer_on_read_subbuffer_mmap(
 	if (stream->net_seq_idx != (uint64_t) -1ULL) {
 		relayd = consumer_find_relayd(stream->net_seq_idx);
 		if (relayd == NULL) {
+			ret = -EPIPE;
 			goto end;
 		}
 	}
@@ -1343,28 +1344,31 @@ ssize_t lttng_consumer_on_read_subbuffer_mmap(
 	case LTTNG_CONSUMER_KERNEL:
 		mmap_base = stream->mmap_base;
 		ret = kernctl_get_mmap_read_offset(stream->wait_fd, &mmap_offset);
+		if (ret != 0) {
+			PERROR("tracer ctl get_mmap_read_offset");
+			written = -errno;
+			goto end;
+		}
 		break;
 	case LTTNG_CONSUMER32_UST:
 	case LTTNG_CONSUMER64_UST:
 		mmap_base = lttng_ustctl_get_mmap_base(stream);
 		if (!mmap_base) {
 			ERR("read mmap get mmap base for stream %s", stream->name);
-			written = -1;
+			written = -EPERM;
 			goto end;
 		}
 		ret = lttng_ustctl_get_mmap_read_offset(stream, &mmap_offset);
-
+		if (ret != 0) {
+			PERROR("tracer ctl get_mmap_read_offset");
+			written = ret;
+			goto end;
+		}
 		break;
 	default:
 		ERR("Unknown consumer_data type");
 		assert(0);
 	}
-	if (ret != 0) {
-		errno = -ret;
-		PERROR("tracer ctl get_mmap_read_offset");
-		written = ret;
-		goto end;
-	}
 
 	/* Handle stream on the relayd if the output is on the network */
 	if (relayd) {
@@ -1427,6 +1431,8 @@ ssize_t lttng_consumer_on_read_subbuffer_mmap(
 			outfd = stream->out_fd = ret;
 			/* Reset current size because we just perform a rotation. */
 			stream->tracefile_size_current = 0;
+			stream->out_fd_offset = 0;
+			orig_offset = 0;
 		}
 		stream->tracefile_size_current += len;
 	}
@@ -1445,7 +1451,7 @@ ssize_t lttng_consumer_on_read_subbuffer_mmap(
 			 */
 			DBG("Error in file write mmap");
 			if (written == 0) {
-				written = ret;
+				written = -errno;
 			}
 			/* Socket operation failed. We consider the relayd dead */
 			if (errno == EPIPE || errno == EINVAL) {
@@ -1533,6 +1539,7 @@ ssize_t lttng_consumer_on_read_subbuffer_splice(
 	if (stream->net_seq_idx != (uint64_t) -1ULL) {
 		relayd = consumer_find_relayd(stream->net_seq_idx);
 		if (relayd == NULL) {
+			ret = -EPIPE;
 			goto end;
 		}
 	}
@@ -1609,6 +1616,8 @@ ssize_t lttng_consumer_on_read_subbuffer_splice(
 			outfd = stream->out_fd = ret;
 			/* Reset current size because we just perform a rotation. */
 			stream->tracefile_size_current = 0;
+			stream->out_fd_offset = 0;
+			orig_offset = 0;
 		}
 		stream->tracefile_size_current += len;
 	}