X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fbuffer-registry.c;h=ad103d1dec36e2afcf7cfd1f9861feda044aa198;hb=84cc9aa082cd6cdbdee83f881046e45ca9f37d97;hp=2df98d7360445b42ae4aba1941cd976d16e6d723;hpb=36b588eddce05ef840bd247f6a58316925b9a0a2;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/buffer-registry.c b/src/bin/lttng-sessiond/buffer-registry.c
index 2df98d736..ad103d1de 100644
--- a/src/bin/lttng-sessiond/buffer-registry.c
+++ b/src/bin/lttng-sessiond/buffer-registry.c
@@ -25,6 +25,7 @@
 #include "fd-limit.h"
 #include "ust-consumer.h"
 #include "ust-ctl.h"
+#include "utils.h"
 
 /*
  * Set in main.c during initialization process of the daemon. This contains
@@ -492,8 +493,7 @@ void buffer_reg_channel_destroy(struct buffer_reg_channel *regp,
 		return;
 	}
 
-	DBG3("Buffer registry channel destroy with key %" PRIu32 " and handle %d",
-			regp->key, regp->obj.ust->handle);
+	DBG3("Buffer registry channel destroy with key %" PRIu32, regp->key);
 
 	switch (domain) {
 	case LTTNG_DOMAIN_UST:
@@ -549,7 +549,7 @@ static void buffer_reg_session_destroy(struct buffer_reg_session *regp,
 	}
 	rcu_read_unlock();
 
-	lttng_ht_destroy(regp->channels);
+	ht_cleanup_push(regp->channels);
 
 	switch (domain) {
 	case LTTNG_DOMAIN_UST:
@@ -693,6 +693,6 @@ void buffer_reg_pid_destroy(struct buffer_reg_pid *regp)
 void buffer_reg_destroy_registries(void)
 {
 	DBG3("Buffer registry destroy all registry");
-	lttng_ht_destroy(buffer_registry_uid);
-	lttng_ht_destroy(buffer_registry_pid);
+	ht_cleanup_push(buffer_registry_uid);
+	ht_cleanup_push(buffer_registry_pid);
 }