X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fust-consumer%2Fust-consumer.c;h=676aa0d9e2f066bec6b439f61e151579f4758bb5;hp=5bcca4e17a3d94622f423d8a30e410e05473d741;hb=6a00837f8cb0431a2ad90974d67fae138ea97dd5;hpb=b8086166dbf40d53a4a1e3f0cddbf291fac97bd3

diff --git a/src/common/ust-consumer/ust-consumer.c b/src/common/ust-consumer/ust-consumer.c
index 5bcca4e17..676aa0d9e 100644
--- a/src/common/ust-consumer/ust-consumer.c
+++ b/src/common/ust-consumer/ust-consumer.c
@@ -194,18 +194,41 @@ static int send_stream_to_thread(struct lttng_consumer_stream *stream,
 
 	/* Get the right pipe where the stream will be sent. */
 	if (stream->metadata_flag) {
+		ret = consumer_add_metadata_stream(stream);
+		if (ret) {
+			ERR("Consumer add metadata stream %" PRIu64 " failed.",
+					stream->key);
+			goto error;
+		}
 		stream_pipe = ctx->consumer_metadata_pipe;
 	} else {
+		ret = consumer_add_data_stream(stream);
+		if (ret) {
+			ERR("Consumer add stream %" PRIu64 " failed.",
+					stream->key);
+			goto error;
+		}
 		stream_pipe = ctx->consumer_data_pipe;
 	}
 
+	/*
+	 * From this point on, the stream's ownership has been moved away from
+	 * the channel and becomes globally visible.
+	 */
+	stream->globally_visible = 1;
+
 	ret = lttng_pipe_write(stream_pipe, &stream, sizeof(stream));
 	if (ret < 0) {
 		ERR("Consumer write %s stream to pipe %d",
 				stream->metadata_flag ? "metadata" : "data",
 				lttng_pipe_get_writefd(stream_pipe));
+		if (stream->metadata_flag) {
+			consumer_del_stream_for_metadata(stream);
+		} else {
+			consumer_del_stream_for_data(stream);
+		}
 	}
-
+error:
 	return ret;
 }
 
@@ -533,17 +556,14 @@ static int send_streams_to_thread(struct lttng_consumer_channel *channel,
 			 * If we are unable to send the stream to the thread, there is
 			 * a big problem so just stop everything.
 			 */
+			/* Remove node from the channel stream list. */
+			cds_list_del(&stream->send_node);
 			goto error;
 		}
 
 		/* Remove node from the channel stream list. */
 		cds_list_del(&stream->send_node);
 
-		/*
-		 * From this point on, the stream's ownership has been moved away from
-		 * the channel and becomes globally visible.
-		 */
-		stream->globally_visible = 1;
 	}
 
 error:
@@ -747,7 +767,8 @@ static int snapshot_metadata(uint64_t key, char *path, uint64_t relayd_id,
 
 	metadata_channel = consumer_find_channel(key);
 	if (!metadata_channel) {
-		ERR("UST snapshot metadata channel not found for key %lu", key);
+		ERR("UST snapshot metadata channel not found for key %" PRIu64,
+			key);
 		ret = -1;
 		goto error;
 	}
@@ -843,12 +864,12 @@ static int snapshot_channel(uint64_t key, char *path, uint64_t relayd_id,
 
 	channel = consumer_find_channel(key);
 	if (!channel) {
-		ERR("UST snapshot channel not found for key %lu", key);
+		ERR("UST snapshot channel not found for key %" PRIu64, key);
 		ret = -1;
 		goto error;
 	}
 	assert(!channel->monitor);
-	DBG("UST consumer snapshot channel %lu", key);
+	DBG("UST consumer snapshot channel %" PRIu64, key);
 
 	cds_list_for_each_entry(stream, &channel->streams.head, send_node) {
 		/* Lock stream because we are about to change its state. */