X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fkernel-consumer%2Fkernel-consumer.c;h=4d61cc506f32e57896b96bf72ee50b91cc3a50b5;hp=a288df3cd5f9f3e0fc79b793ff7720f229ee1f61;hb=633d0084183d5b0aed953ce267e0e57e5ef29bd5;hpb=c80048c6378b9ee7796c4b833a2c07f6050cc6d7

diff --git a/src/common/kernel-consumer/kernel-consumer.c b/src/common/kernel-consumer/kernel-consumer.c
index a288df3cd..4d61cc506 100644
--- a/src/common/kernel-consumer/kernel-consumer.c
+++ b/src/common/kernel-consumer/kernel-consumer.c
@@ -215,29 +215,23 @@ int lttng_kconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
 			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;
-				}
+		if (ctx->on_recv_stream) {
+			ret = ctx->on_recv_stream(new_stream);
+			if (ret < 0) {
+				goto end_nosignal;
 			}
+		}
 
+		/* Send stream to the metadata thread */
+		if (new_stream->metadata_flag) {
 			do {
-				ret = write(ctx->consumer_metadata_pipe[1], new_stream,
-						sizeof(struct lttng_consumer_stream));
+				ret = write(ctx->consumer_metadata_pipe[1], &new_stream,
+						sizeof(new_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);
 		}