#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
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;
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;
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;
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;
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;
}
rcu_read_unlock();
- ht_cleanup_push(regp->channels);
+ lttng_ht_destroy(regp->channels);
switch (domain) {
case LTTNG_DOMAIN_UST:
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);
}