X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fust-consumer%2Fust-consumer.cpp;h=0340434448e7be0350a1db630f5eea9b63b44a9f;hb=d9ab8c66f3e1007a28dfe3fd63f844dcd15b16af;hp=431bb98f6cd25ce1da5315ffd177b37960525d04;hpb=a00932c89ecca1b8ff133df17cc6737322247f4b;p=lttng-tools.git

diff --git a/src/common/ust-consumer/ust-consumer.cpp b/src/common/ust-consumer/ust-consumer.cpp
index 431bb98f6..034043444 100644
--- a/src/common/ust-consumer/ust-consumer.cpp
+++ b/src/common/ust-consumer/ust-consumer.cpp
@@ -2093,9 +2093,11 @@ end_rotate_channel_nosignal:
 	case LTTNG_CONSUMER_INIT:
 	{
 		int ret_send_status;
+		lttng_uuid sessiond_uuid;
 
-		ret_code = lttng_consumer_init_command(ctx,
-				msg.u.init.sessiond_uuid);
+		std::copy(std::begin(msg.u.init.sessiond_uuid), std::end(msg.u.init.sessiond_uuid),
+				sessiond_uuid.begin());
+		ret_code = lttng_consumer_init_command(ctx, sessiond_uuid);
 		health_code_update();
 		ret_send_status = consumer_send_status_msg(sock, ret_code);
 		if (ret_send_status < 0) {
@@ -2421,8 +2423,9 @@ void lttng_ustconsumer_on_stream_hangup(struct lttng_consumer_stream *stream)
 			stream->quiescent = true;
 		}
 	}
-	pthread_mutex_unlock(&stream->lock);
+
 	stream->hangup_flush_done = 1;
+	pthread_mutex_unlock(&stream->lock);
 }
 
 void lttng_ustconsumer_del_channel(struct lttng_consumer_channel *chan)