X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fregister.cpp;h=f6aaef623f23369328ec1fc61b1748b12ed177e0;hb=f149493493fbd8a3efa4748832c03278c96c38ca;hp=5bcc637b0f5c18be82d5ef217f58309e991ffa24;hpb=7966af5763c4aaca39df9bbfa9277ff15715c720;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/register.cpp b/src/bin/lttng-sessiond/register.cpp
index 5bcc637b0..f6aaef623 100644
--- a/src/bin/lttng-sessiond/register.cpp
+++ b/src/bin/lttng-sessiond/register.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011 David Goulet <david.goulet@polymtl.ca>
+ * Copyright (C) 2011 EfficiOS Inc.
  * Copyright (C) 2011 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  * Copyright (C) 2013 Jérémie Galarneau <jeremie.galarneau@efficios.com>
  *
@@ -10,20 +10,21 @@
 #include <stddef.h>
 #include <stdlib.h>
 #include <urcu.h>
-#include <common/futex.h>
-#include <common/macros.h>
-#include <common/shm.h>
-#include <common/utils.h>
+#include <common/futex.hpp>
+#include <common/macros.hpp>
+#include <common/shm.hpp>
+#include <common/utils.hpp>
 #include <sys/stat.h>
 
-#include "register.h"
-#include "lttng-sessiond.h"
-#include "testpoint.h"
-#include "health-sessiond.h"
-#include "fd-limit.h"
-#include "utils.h"
-#include "thread.h"
+#include "register.hpp"
+#include "lttng-sessiond.hpp"
+#include "testpoint.hpp"
+#include "health-sessiond.hpp"
+#include "fd-limit.hpp"
+#include "utils.hpp"
+#include "thread.hpp"
 
+namespace {
 struct thread_state {
 	struct lttng_pipe *quit_pipe;
 	struct ust_cmd_queue *ust_cmd_queue;
@@ -31,6 +32,7 @@ struct thread_state {
 	bool running;
 	int application_socket;
 };
+} /* namespace */
 
 /*
  * Creates the application socket.
@@ -265,7 +267,7 @@ static void *thread_application_registration(void *data)
 					(void) utils_set_fd_cloexec(sock);
 
 					/* Create UST registration command for enqueuing */
-					ust_cmd = (ust_command *) zmalloc(sizeof(struct ust_command));
+					ust_cmd = zmalloc<ust_command>();
 					if (ust_cmd == NULL) {
 						PERROR("ust command zmalloc");
 						ret = close(sock);
@@ -392,7 +394,7 @@ struct lttng_thread *launch_application_registration_thread(
 	const bool is_root = (getuid() == 0);
 	int application_socket = -1;
 
-	thread_state = (struct thread_state *) zmalloc(sizeof(*thread_state));
+	thread_state = zmalloc<struct thread_state>();
 	if (!thread_state) {
 		goto error_alloc;
 	}