X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fkernel-consumer%2Fkernel-consumer.c;h=a94749635246a04f195cf7c0ff577ec9abae3dd1;hp=4f3e2871daeaa1c66faadaf64a754dccf0711b94;hb=5ab669088a63bfc0a138ad8418cea17a58789281;hpb=873b9e9a5a22f81225e3e5aaacb88b26ce739c68

diff --git a/src/common/kernel-consumer/kernel-consumer.c b/src/common/kernel-consumer/kernel-consumer.c
index 4f3e2871d..a94749635 100644
--- a/src/common/kernel-consumer/kernel-consumer.c
+++ b/src/common/kernel-consumer/kernel-consumer.c
@@ -653,21 +653,40 @@ int lttng_kconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
 
 		/* Get the right pipe where the stream will be sent. */
 		if (new_stream->metadata_flag) {
+			ret = consumer_add_metadata_stream(new_stream);
+			if (ret) {
+				ERR("Consumer add metadata stream %" PRIu64 " failed. Continuing",
+						new_stream->key);
+				consumer_stream_free(new_stream);
+				goto end_nosignal;
+			}
 			stream_pipe = ctx->consumer_metadata_pipe;
 		} else {
+			ret = consumer_add_data_stream(new_stream);
+			if (ret) {
+				ERR("Consumer add stream %" PRIu64 " failed. Continuing",
+						new_stream->key);
+				consumer_stream_free(new_stream);
+				goto end_nosignal;
+			}
 			stream_pipe = ctx->consumer_data_pipe;
 		}
 
+		/* Vitible to other threads */
+		new_stream->globally_visible = 1;
+
 		ret = lttng_pipe_write(stream_pipe, &new_stream, sizeof(new_stream));
 		if (ret < 0) {
 			ERR("Consumer write %s stream to pipe %d",
 					new_stream->metadata_flag ? "metadata" : "data",
 					lttng_pipe_get_writefd(stream_pipe));
-			consumer_stream_free(new_stream);
+			if (new_stream->metadata_flag) {
+				consumer_del_stream_for_metadata(new_stream);
+			} else {
+				consumer_del_stream_for_data(new_stream);
+			}
 			goto end_nosignal;
 		}
-		/* Successfully sent to the right thread. */
-		new_stream->globally_visible = 1;
 
 		DBG("Kernel consumer ADD_STREAM %s (fd: %d) with relayd id %" PRIu64,
 				new_stream->name, fd, new_stream->relayd_stream_id);