X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fkernel-consumer%2Fkernel-consumer.c;h=d4a0d7c67c2810a649821cda28a2dc6748d0388d;hb=6dc3064a30b0cc7cfa9fdd22da1963525dfb7388;hp=c0d56171c89f5224f397a347c7774d54d9d32db0;hpb=a0c83db984f8c20897666eef226b43fce81d0e13;p=lttng-tools.git

diff --git a/src/common/kernel-consumer/kernel-consumer.c b/src/common/kernel-consumer/kernel-consumer.c
index c0d56171c..d4a0d7c67 100644
--- a/src/common/kernel-consumer/kernel-consumer.c
+++ b/src/common/kernel-consumer/kernel-consumer.c
@@ -83,6 +83,11 @@ int lttng_kconsumer_get_produced_snapshot(struct lttng_consumer_stream *stream,
 	return ret;
 }
 
+/*
+ * Receive command from session daemon and process it.
+ *
+ * Return 1 on success else a negative value or 0.
+ */
 int lttng_kconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
 		int sock, struct pollfd *consumer_sockpoll)
 {
@@ -93,6 +98,9 @@ int lttng_kconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
 	ret = lttcomm_recv_unix_sock(sock, &msg, sizeof(msg));
 	if (ret != sizeof(msg)) {
 		lttng_consumer_send_error(ctx, LTTCOMM_CONSUMERD_ERROR_RECV_CMD);
+		if (ret > 0) {
+			ret = -1;
+		}
 		return ret;
 	}
 	if (msg.cmd_type == LTTNG_CONSUMER_STOP) {
@@ -128,7 +136,7 @@ int lttng_kconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
 		ret = consumer_send_status_msg(sock, ret_code);
 		if (ret < 0) {
 			/* Somehow, the session daemon is not responding anymore. */
-			goto end_nosignal;
+			goto error_fatal;
 		}
 		DBG("consumer_add_channel %" PRIu64, msg.u.channel.channel_key);
 		new_channel = consumer_allocate_channel(msg.u.channel.channel_key,
@@ -166,8 +174,11 @@ int lttng_kconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
 		}
 
 		/* If we received an error in add_channel, we need to report it. */
-		if (ret != 0) {
-			consumer_send_status_msg(sock, ret);
+		if (ret < 0) {
+			ret = consumer_send_status_msg(sock, ret);
+			if (ret < 0) {
+				goto error_fatal;
+			}
 			goto end_nosignal;
 		}
 
@@ -198,10 +209,16 @@ int lttng_kconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
 
 		/* First send a status message before receiving the fds. */
 		ret = consumer_send_status_msg(sock, ret_code);
-		if (ret < 0 || ret_code != LTTNG_OK) {
+		if (ret < 0) {
+			/*
+			 * Somehow, the session daemon is not responding
+			 * anymore.
+			 */
+			goto error_fatal;
+		}
+		if (ret_code != LTTNG_OK) {
 			/*
-			 * Somehow, the session daemon is not responding anymore or the
-			 * channel was not found.
+			 * Channel was not found.
 			 */
 			goto end_nosignal;
 		}
@@ -300,6 +317,13 @@ int lttng_kconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
 			}
 		}
 
+		if (msg.u.stream.no_monitor) {
+			DBG("Kernel consumer add stream %s in no monitor mode with"
+					"relayd id %" PRIu64, new_stream->name,
+					new_stream->relayd_stream_id);
+			break;
+		}
+
 		/* Get the right pipe where the stream will be sent. */
 		if (new_stream->metadata_flag) {
 			stream_pipe = ctx->consumer_metadata_pipe;
@@ -356,7 +380,7 @@ int lttng_kconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
 		ret = consumer_send_status_msg(sock, ret_code);
 		if (ret < 0) {
 			/* Somehow, the session daemon is not responding anymore. */
-			goto end_nosignal;
+			goto error_fatal;
 		}
 
 		goto end_nosignal;
@@ -374,6 +398,7 @@ int lttng_kconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
 		ret = lttcomm_send_unix_sock(sock, &ret, sizeof(ret));
 		if (ret < 0) {
 			PERROR("send data pending ret code");
+			goto error_fatal;
 		}
 
 		/*
@@ -382,6 +407,15 @@ int lttng_kconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
 		 */
 		break;
 	}
+	case LTTNG_CONSUMER_SNAPSHOT_CHANNEL:
+	{
+		ret = consumer_send_status_msg(sock, ret_code);
+		if (ret < 0) {
+			/* Somehow, the session daemon is not responding anymore. */
+			goto end_nosignal;
+		}
+		break;
+	}
 	default:
 		goto end_nosignal;
 	}
@@ -394,6 +428,11 @@ end_nosignal:
 	 * shutdown during the recv() or send() call.
 	 */
 	return 1;
+
+error_fatal:
+	rcu_read_unlock();
+	/* This will issue a consumer stop. */
+	return -1;
 }
 
 /*