X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fkernel-consumer%2Fkernel-consumer.c;h=cbd1b5aac223962275b7be3472c7f498eb761077;hb=f261ad0ad8d93634b4a6d7581628e236aa696049;hp=57dc2ba6a76767d623c62fc552cb413fd0a0e71f;hpb=f263b7fd113e51d0737554e8232b8669e142a260;p=lttng-tools.git

diff --git a/src/common/kernel-consumer/kernel-consumer.c b/src/common/kernel-consumer/kernel-consumer.c
index 57dc2ba6a..cbd1b5aac 100644
--- a/src/common/kernel-consumer/kernel-consumer.c
+++ b/src/common/kernel-consumer/kernel-consumer.c
@@ -61,7 +61,7 @@ int lttng_kconsumer_take_snapshot(struct lttng_consumer_stream *stream)
 
 	ret = kernctl_snapshot(infd);
 	if (ret != 0) {
-		perror("Getting sub-buffer snapshot.");
+		PERROR("Getting sub-buffer snapshot.");
 		ret = -errno;
 	}
 
@@ -81,7 +81,7 @@ int lttng_kconsumer_get_produced_snapshot(struct lttng_consumer_stream *stream,
 
 	ret = kernctl_snapshot_get_produced(infd, pos);
 	if (ret != 0) {
-		perror("kernctl_snapshot_get_produced");
+		PERROR("kernctl_snapshot_get_produced");
 		ret = -errno;
 	}
 
@@ -101,7 +101,7 @@ int lttng_kconsumer_get_consumed_snapshot(struct lttng_consumer_stream *stream,
 
 	ret = kernctl_snapshot_get_consumed(infd, pos);
 	if (ret != 0) {
-		perror("kernctl_snapshot_get_consumed");
+		PERROR("kernctl_snapshot_get_consumed");
 		ret = -errno;
 	}
 
@@ -562,7 +562,7 @@ int lttng_kconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
 			 * happens while tearing down.
 			 */
 			ERR("Unable to find channel key %" PRIu64, msg.u.stream.channel_key);
-			ret_code = LTTNG_ERR_KERN_CHAN_NOT_FOUND;
+			ret_code = LTTCOMM_CONSUMERD_CHAN_NOT_FOUND;
 		}
 
 		health_code_update();
@@ -765,7 +765,7 @@ int lttng_kconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
 			 */
 			ERR("Unable to find channel key %" PRIu64,
 					msg.u.sent_streams.channel_key);
-			ret_code = LTTNG_ERR_KERN_CHAN_NOT_FOUND;
+			ret_code = LTTCOMM_CONSUMERD_CHAN_NOT_FOUND;
 		}
 
 		health_code_update();
@@ -774,7 +774,7 @@ int lttng_kconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
 		 * Send status code to session daemon.
 		 */
 		ret = consumer_send_status_msg(sock, ret_code);
-		if (ret < 0) {
+		if (ret < 0 || ret_code != LTTCOMM_CONSUMERD_SUCCESS) {
 			/* Somehow, the session daemon is not responding anymore. */
 			goto end_nosignal;
 		}
@@ -816,7 +816,7 @@ int lttng_kconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
 		relayd = consumer_find_relayd(index);
 		if (relayd == NULL) {
 			DBG("Unable to find relayd %" PRIu64, index);
-			ret_code = LTTNG_ERR_NO_CONSUMER;
+			ret_code = LTTCOMM_CONSUMERD_RELAYD_FAIL;
 		}
 
 		/*
@@ -875,7 +875,7 @@ int lttng_kconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
 					msg.u.snapshot_channel.relayd_id, ctx);
 			if (ret < 0) {
 				ERR("Snapshot metadata failed");
-				ret_code = LTTNG_ERR_KERN_META_FAIL;
+				ret_code = LTTCOMM_CONSUMERD_ERROR_METADATA;
 			}
 		} else {
 			ret = lttng_kconsumer_snapshot_channel(msg.u.snapshot_channel.key,
@@ -885,7 +885,7 @@ int lttng_kconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
 					ctx);
 			if (ret < 0) {
 				ERR("Snapshot channel failed");
-				ret_code = LTTNG_ERR_KERN_CHAN_FAIL;
+				ret_code = LTTCOMM_CONSUMERD_CHAN_NOT_FOUND;
 			}
 		}
 
@@ -906,7 +906,7 @@ int lttng_kconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
 		channel = consumer_find_channel(key);
 		if (!channel) {
 			ERR("Kernel consumer destroy channel %" PRIu64 " not found", key);
-			ret_code = LTTNG_ERR_KERN_CHAN_NOT_FOUND;
+			ret_code = LTTCOMM_CONSUMERD_CHAN_NOT_FOUND;
 		}
 
 		health_code_update();
@@ -1083,7 +1083,18 @@ ssize_t lttng_kconsumer_read_subbuffer(struct lttng_consumer_stream *stream,
 	/* Get the full subbuffer size including padding */
 	err = kernctl_get_padded_subbuf_size(infd, &len);
 	if (err != 0) {
-		perror("Getting sub-buffer len failed.");
+		PERROR("Getting sub-buffer len failed.");
+		err = kernctl_put_subbuf(infd);
+		if (err != 0) {
+			if (errno == EFAULT) {
+				PERROR("Error in unreserving sub buffer\n");
+			} else if (errno == EIO) {
+				/* Should never happen with newer LTTng versions */
+				PERROR("Reader has been pushed by the writer, last sub-buffer corrupted.");
+			}
+			ret = -errno;
+			goto end;
+		}
 		ret = -errno;
 		goto end;
 	}
@@ -1091,6 +1102,17 @@ ssize_t lttng_kconsumer_read_subbuffer(struct lttng_consumer_stream *stream,
 	if (!stream->metadata_flag) {
 		ret = get_index_values(&index, infd);
 		if (ret < 0) {
+			err = kernctl_put_subbuf(infd);
+			if (err != 0) {
+				if (errno == EFAULT) {
+					PERROR("Error in unreserving sub buffer\n");
+				} else if (errno == EIO) {
+					/* Should never happen with newer LTTng versions */
+					PERROR("Reader has been pushed by the writer, last sub-buffer corrupted.");
+				}
+				ret = -errno;
+				goto end;
+			}
 			goto end;
 		}
 	} else {
@@ -1128,7 +1150,18 @@ ssize_t lttng_kconsumer_read_subbuffer(struct lttng_consumer_stream *stream,
 		/* Get subbuffer size without padding */
 		err = kernctl_get_subbuf_size(infd, &subbuf_size);
 		if (err != 0) {
-			perror("Getting sub-buffer len failed.");
+			PERROR("Getting sub-buffer len failed.");
+			err = kernctl_put_subbuf(infd);
+			if (err != 0) {
+				if (errno == EFAULT) {
+					PERROR("Error in unreserving sub buffer\n");
+				} else if (errno == EIO) {
+					/* Should never happen with newer LTTng versions */
+					PERROR("Reader has been pushed by the writer, last sub-buffer corrupted.");
+				}
+				ret = -errno;
+				goto end;
+			}
 			ret = -errno;
 			goto end;
 		}
@@ -1167,10 +1200,10 @@ ssize_t lttng_kconsumer_read_subbuffer(struct lttng_consumer_stream *stream,
 	err = kernctl_put_next_subbuf(infd);
 	if (err != 0) {
 		if (errno == EFAULT) {
-			perror("Error in unreserving sub buffer\n");
+			PERROR("Error in unreserving sub buffer\n");
 		} else if (errno == EIO) {
 			/* Should never happen with newer LTTng versions */
-			perror("Reader has been pushed by the writer, last sub-buffer corrupted.");
+			PERROR("Reader has been pushed by the writer, last sub-buffer corrupted.");
 		}
 		ret = -errno;
 		goto end;