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

diff --git a/src/common/ust-consumer/ust-consumer.c b/src/common/ust-consumer/ust-consumer.c
index 9e1a59f5e..f57e2e602 100644
--- a/src/common/ust-consumer/ust-consumer.c
+++ b/src/common/ust-consumer/ust-consumer.c
@@ -244,29 +244,24 @@ int lttng_ustconsumer_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;
-				}
+		/* Do actions once stream has been received. */
+		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);
 		}
 
@@ -481,7 +476,6 @@ int lttng_ustconsumer_read_subbuffer(struct lttng_consumer_stream *stream,
 		ERR("Error writing to tracefile "
 				"(ret: %zd != len: %lu != subbuf_size: %lu)",
 				ret, len, subbuf_size);
-
 	}
 	err = ustctl_put_next_subbuf(handle, buf);
 	assert(err == 0);