X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fconsumer.c;h=b1ccbc1082c7728e306bdccfa680652063bc358a;hp=d3c561c9ec6932531fc3c46a1a464835dc45e12f;hb=af706bb7e9bda5d6b95414165681abe422f1541e;hpb=16f6f82061de8b2a778e7c2a082d07c79ed8a790

diff --git a/src/bin/lttng-sessiond/consumer.c b/src/bin/lttng-sessiond/consumer.c
index d3c561c9e..b1ccbc108 100644
--- a/src/bin/lttng-sessiond/consumer.c
+++ b/src/bin/lttng-sessiond/consumer.c
@@ -408,6 +408,28 @@ error:
 	return output;
 }
 
+/*
+ * Iterate over the consumer output socket hash table and destroy them. The
+ * socket file descriptor are only closed if the consumer output was
+ * registered meaning it's an external consumer.
+ */
+void consumer_destroy_output_sockets(struct consumer_output *obj)
+{
+	struct lttng_ht_iter iter;
+	struct consumer_socket *socket;
+
+	if (!obj->socks) {
+		return;
+	}
+
+	rcu_read_lock();
+	cds_lfht_for_each_entry(obj->socks->ht, &iter.iter, socket, node.node) {
+		consumer_del_socket(socket, obj);
+		consumer_destroy_socket(socket);
+	}
+	rcu_read_unlock();
+}
+
 /*
  * Delete the consumer_output object from the list and free the ptr.
  *
@@ -419,17 +441,9 @@ void consumer_destroy_output(struct consumer_output *obj)
 		return;
 	}
 
-	if (obj->socks) {
-		struct lttng_ht_iter iter;
-		struct consumer_socket *socket;
-
-		rcu_read_lock();
-		cds_lfht_for_each_entry(obj->socks->ht, &iter.iter, socket, node.node) {
-			consumer_del_socket(socket, obj);
-			consumer_destroy_socket(socket);
-		}
-		rcu_read_unlock();
+	consumer_destroy_output_sockets(obj);
 
+	if (obj->socks) {
 		/* Finally destroy HT */
 		ht_cleanup_push(obj->socks);
 	}