X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fbuffer-registry.cpp;h=ca7830a384d8dcca29537fc4e0c724f4216f9f7d;hb=c9e313bc594f40a86eed237dce222c0fc99c957f;hp=3928818272e1f334871b749f4684a38a813b2389;hpb=ff9fe3137fc1aec6e18ebbf7c218907698206e7d;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/buffer-registry.cpp b/src/bin/lttng-sessiond/buffer-registry.cpp
index 392881827..ca7830a38 100644
--- a/src/bin/lttng-sessiond/buffer-registry.cpp
+++ b/src/bin/lttng-sessiond/buffer-registry.cpp
@@ -8,15 +8,15 @@
 #define _LGPL_SOURCE
 #include <inttypes.h>
 
-#include <common/common.h>
-#include <common/hashtable/utils.h>
+#include <common/common.hpp>
+#include <common/hashtable/utils.hpp>
 
-#include "buffer-registry.h"
-#include "fd-limit.h"
-#include "ust-consumer.h"
-#include "lttng-ust-ctl.h"
-#include "lttng-ust-error.h"
-#include "utils.h"
+#include "buffer-registry.hpp"
+#include "fd-limit.hpp"
+#include "ust-consumer.hpp"
+#include "lttng-ust-ctl.hpp"
+#include "lttng-ust-error.hpp"
+#include "utils.hpp"
 
 /*
  * Set in main.c during initialization process of the daemon. This contains
@@ -185,6 +185,8 @@ struct buffer_reg_uid *buffer_reg_uid_find(uint64_t session_id,
 	struct buffer_reg_uid *reg = NULL, key;
 	struct lttng_ht *ht = buffer_registry_uid;
 
+	ASSERT_RCU_READ_LOCKED();
+
 	/* Setup key we are looking for. */
 	key.session_id = session_id;
 	key.bits_per_long = bits_per_long;
@@ -594,7 +596,7 @@ static void buffer_reg_session_destroy(struct buffer_reg_session *regp,
 	}
 	rcu_read_unlock();
 
-	ht_cleanup_push(regp->channels);
+	lttng_ht_destroy(regp->channels);
 
 	switch (domain) {
 	case LTTNG_DOMAIN_UST:
@@ -737,6 +739,6 @@ void buffer_reg_pid_destroy(struct buffer_reg_pid *regp)
 void buffer_reg_destroy_registries(void)
 {
 	DBG3("Buffer registry destroy all registry");
-	ht_cleanup_push(buffer_registry_uid);
-	ht_cleanup_push(buffer_registry_pid);
+	lttng_ht_destroy(buffer_registry_uid);
+	lttng_ht_destroy(buffer_registry_pid);
 }