X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fust-consumer%2Fust-consumer.c;h=5e2f7692b1e6e7c35ffbc574fa45f974c4e9f117;hp=2b8098835857106a811f03761fcafe7489f1ce1f;hb=fb3a43a9284f3300e9b66edc2f2c2d2767895423;hpb=4cbc1a04e8ac3c1dd4f9a4dc44b56ee8430189f0

diff --git a/src/common/ust-consumer/ust-consumer.c b/src/common/ust-consumer/ust-consumer.c
index 2b8098835..5e2f7692b 100644
--- a/src/common/ust-consumer/ust-consumer.c
+++ b/src/common/ust-consumer/ust-consumer.c
@@ -228,14 +228,29 @@ int lttng_ustconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
 			goto end_nosignal;
 		}
 
-		if (ctx->on_recv_stream != NULL) {
-			ret = ctx->on_recv_stream(new_stream);
-			if (ret == 0) {
-				consumer_add_stream(new_stream);
-			} else if (ret < 0) {
-				goto end_nosignal;
+		/* Send stream to the metadata thread */
+		if (new_stream->metadata_flag) {
+			if (ctx->on_recv_stream) {
+				ret = ctx->on_recv_stream(new_stream);
+				if (ret < 0) {
+					goto end_nosignal;
+				}
+			}
+
+			do {
+				ret = write(ctx->consumer_metadata_pipe[1], new_stream,
+						sizeof(struct lttng_consumer_stream));
+			} while (ret < 0 && errno == EINTR);
+			if (ret < 0) {
+				PERROR("write metadata pipe");
 			}
 		} else {
+			if (ctx->on_recv_stream) {
+				ret = ctx->on_recv_stream(new_stream);
+				if (ret < 0) {
+					goto end_nosignal;
+				}
+			}
 			consumer_add_stream(new_stream);
 		}