X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fconsumer.c;h=30a95b48f4fc7d12e307e3752ff9f2b4d2bc19cd;hb=e1b71bdc87cefd070ae082d88f6d4af5f2bcbd62;hp=0005b1039cb27d6ced5dfac3537e72bbf737fce0;hpb=10a5031171c7bca5b4498c871b119e5a88b6a3fb;p=lttng-tools.git

diff --git a/src/common/consumer.c b/src/common/consumer.c
index 0005b1039..30a95b48f 100644
--- a/src/common/consumer.c
+++ b/src/common/consumer.c
@@ -292,21 +292,22 @@ void consumer_del_channel(struct lttng_consumer_channel *channel)
 
 	pthread_mutex_lock(&consumer_data.lock);
 
+	/* Delete streams that might have been left in the stream list. */
+	cds_list_for_each_entry_safe(stream, stmp, &channel->streams.head,
+			send_node) {
+		cds_list_del(&stream->send_node);
+		/*
+		 * Once a stream is added to this list, the buffers were created so
+		 * we have a guarantee that this call will succeed.
+		 */
+		consumer_stream_destroy(stream, NULL);
+	}
+
 	switch (consumer_data.type) {
 	case LTTNG_CONSUMER_KERNEL:
 		break;
 	case LTTNG_CONSUMER32_UST:
 	case LTTNG_CONSUMER64_UST:
-		/* Delete streams that might have been left in the stream list. */
-		cds_list_for_each_entry_safe(stream, stmp, &channel->streams.head,
-				send_node) {
-			cds_list_del(&stream->send_node);
-			/*
-			 * Once a stream is added to this list, the buffers were created so
-			 * we have a guarantee that this call will succeed.
-			 */
-			consumer_stream_destroy(stream, NULL);
-		}
 		lttng_ustconsumer_del_channel(channel);
 		break;
 	default: