X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fkernel-consumer%2Fkernel-consumer.c;h=f2023a6961e3f13b619fbeb92a761c8e1fd7998c;hp=e5595a1c3c106973bbbd285997612b98d422bca0;hb=6c1c0768320135c6936c371b09731851b508c023;hpb=8265f19e4002c6826f9b96e55075d3382602e0c3

diff --git a/src/common/kernel-consumer/kernel-consumer.c b/src/common/kernel-consumer/kernel-consumer.c
index e5595a1c3..f2023a696 100644
--- a/src/common/kernel-consumer/kernel-consumer.c
+++ b/src/common/kernel-consumer/kernel-consumer.c
@@ -17,6 +17,7 @@
  */
 
 #define _GNU_SOURCE
+#define _LGPL_SOURCE
 #include <assert.h>
 #include <poll.h>
 #include <pthread.h>
@@ -61,7 +62,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 +82,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 +102,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;
 	}
 
@@ -774,7 +775,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;
 		}
@@ -1083,14 +1084,14 @@ 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");
+				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;
@@ -1105,10 +1106,10 @@ ssize_t lttng_kconsumer_read_subbuffer(struct lttng_consumer_stream *stream,
 			err = kernctl_put_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;
@@ -1150,14 +1151,14 @@ 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");
+					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;
@@ -1200,10 +1201,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;