X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fbuffer-registry.cpp;h=7a446633b8f878cbd6cfaad67a2a07ee33dd281b;hb=6f729565b0b93009bc1e91a05bae6b7e04c1e8a1;hp=3daca3c95b3c381da7ada09e1a0c93c9de786285;hpb=3c3390532736cfb5198f863d0d2b218e21fcf76d;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/buffer-registry.cpp b/src/bin/lttng-sessiond/buffer-registry.cpp
index 3daca3c95..7a446633b 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
@@ -104,14 +104,14 @@ int buffer_reg_uid_create(uint64_t session_id, uint32_t bits_per_long, uid_t uid
 
 	LTTNG_ASSERT(regp);
 
-	reg = (buffer_reg_uid *) zmalloc(sizeof(*reg));
+	reg = zmalloc<buffer_reg_uid>();
 	if (!reg) {
 		PERROR("zmalloc buffer registry uid");
 		ret = -ENOMEM;
 		goto error;
 	}
 
-	reg->registry = (buffer_reg_session *) zmalloc(sizeof(struct buffer_reg_session));
+	reg->registry = zmalloc<buffer_reg_session>();
 	if (!reg->registry) {
 		PERROR("zmalloc buffer registry uid session");
 		ret = -ENOMEM;
@@ -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;
@@ -232,14 +234,14 @@ int buffer_reg_pid_create(uint64_t session_id, struct buffer_reg_pid **regp,
 
 	LTTNG_ASSERT(regp);
 
-	reg = (buffer_reg_pid *) zmalloc(sizeof(*reg));
+	reg = zmalloc<buffer_reg_pid>();
 	if (!reg) {
 		PERROR("zmalloc buffer registry pid");
 		ret = -ENOMEM;
 		goto error;
 	}
 
-	reg->registry = (buffer_reg_session *) zmalloc(sizeof(struct buffer_reg_session));
+	reg->registry = zmalloc<buffer_reg_session>();
 	if (!reg->registry) {
 		PERROR("zmalloc buffer registry pid session");
 		ret = -ENOMEM;
@@ -369,7 +371,7 @@ int buffer_reg_channel_create(uint64_t key, struct buffer_reg_channel **regp)
 
 	DBG3("Buffer registry channel create with key: %" PRIu64, key);
 
-	reg = (buffer_reg_channel *) zmalloc(sizeof(*reg));
+	reg = zmalloc<buffer_reg_channel>();
 	if (!reg) {
 		PERROR("zmalloc buffer registry channel");
 		return -ENOMEM;
@@ -399,7 +401,7 @@ int buffer_reg_stream_create(struct buffer_reg_stream **regp)
 
 	DBG3("Buffer registry creating stream");
 
-	reg = (buffer_reg_stream *) zmalloc(sizeof(*reg));
+	reg = zmalloc<buffer_reg_stream>();
 	if (!reg) {
 		PERROR("zmalloc buffer registry stream");
 		return -ENOMEM;