X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=src%2Fcommon%2Fust-consumer%2Fust-consumer.cpp;h=0933c33c8b77e4dae3179b741fbe2b08c8e38dce;hb=c58be5fff5569f2959c79651e02af0a5f641ccb3;hp=766c9d30c7ff27f1a7ff796043f24aaf2a3ad90a;hpb=64803277bbdbe0a943360d918298a48157d9da55;p=lttng-tools.git

diff --git a/src/common/ust-consumer/ust-consumer.cpp b/src/common/ust-consumer/ust-consumer.cpp
index 766c9d30c..0933c33c8 100644
--- a/src/common/ust-consumer/ust-consumer.cpp
+++ b/src/common/ust-consumer/ust-consumer.cpp
@@ -49,46 +49,6 @@ extern int consumer_poll_timeout;
 
 LTTNG_EXPORT DEFINE_LTTNG_UST_SIGBUS_STATE();
 
-/*
- * Free channel object and all streams associated with it. This MUST be used
- * only and only if the channel has _NEVER_ been added to the global channel
- * hash table.
- */
-static void destroy_channel(struct lttng_consumer_channel *channel)
-{
-	struct lttng_consumer_stream *stream, *stmp;
-
-	LTTNG_ASSERT(channel);
-
-	DBG("UST consumer cleaning stream list");
-
-	cds_list_for_each_entry_safe(stream, stmp, &channel->streams.head,
-			send_node) {
-
-		health_code_update();
-
-		cds_list_del_init(&stream->send_node);
-		lttng_ust_ctl_destroy_stream(stream->ustream);
-		lttng_trace_chunk_put(stream->trace_chunk);
-		free(stream);
-	}
-
-	/*
-	 * If a channel is available meaning that was created before the streams
-	 * were, delete it.
-	 */
-	if (channel->uchan) {
-		lttng_ustconsumer_del_channel(channel);
-		lttng_ustconsumer_free_channel(channel);
-	}
-
-	if (channel->trace_chunk) {
-		lttng_trace_chunk_put(channel->trace_chunk);
-	}
-
-	free(channel);
-}
-
 /*
  * Add channel to internal consumer state.
  *
@@ -2133,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) {
@@ -2315,11 +2277,7 @@ end_msg_sessiond:
 
 end_channel_error:
 	if (channel) {
-		/*
-		 * Free channel here since no one has a reference to it. We don't
-		 * free after that because a stream can store this pointer.
-		 */
-		destroy_channel(channel);
+		consumer_del_channel(channel);
 	}
 	/* We have to send a status channel message indicating an error. */
 	{