X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2Flive.cpp;h=abbec8c20e89e02253a0dce83a38a138909b9dff;hb=0114db0ec2407029052eb61a0189c9b1cd64d520;hp=3efa1beda7d27a0fac613debbbc789c95d80860c;hpb=f46376a14da2eb796690cb4e718e8b213839d6ea;p=lttng-tools.git

diff --git a/src/bin/lttng-relayd/live.cpp b/src/bin/lttng-relayd/live.cpp
index 3efa1beda..abbec8c20 100644
--- a/src/bin/lttng-relayd/live.cpp
+++ b/src/bin/lttng-relayd/live.cpp
@@ -31,34 +31,34 @@
 #include <urcu/uatomic.h>
 #include <string>
 
-#include <common/common.h>
-#include <common/compat/endian.h>
-#include <common/compat/poll.h>
-#include <common/compat/socket.h>
-#include <common/defaults.h>
-#include <common/fd-tracker/utils.h>
-#include <common/fs-handle.h>
-#include <common/futex.h>
-#include <common/index/index.h>
-#include <common/sessiond-comm/inet.h>
-#include <common/sessiond-comm/relayd.h>
-#include <common/sessiond-comm/sessiond-comm.h>
-#include <common/uri.h>
-#include <common/utils.h>
+#include <common/common.hpp>
+#include <common/compat/endian.hpp>
+#include <common/compat/poll.hpp>
+#include <common/compat/socket.hpp>
+#include <common/defaults.hpp>
+#include <common/fd-tracker/utils.hpp>
+#include <common/fs-handle.hpp>
+#include <common/futex.hpp>
+#include <common/index/index.hpp>
+#include <common/sessiond-comm/inet.hpp>
+#include <common/sessiond-comm/relayd.hpp>
+#include <common/sessiond-comm/sessiond-comm.hpp>
+#include <common/uri.hpp>
+#include <common/utils.hpp>
 #include <lttng/lttng.h>
 
-#include "cmd.h"
-#include "connection.h"
-#include "ctf-trace.h"
-#include "health-relayd.h"
-#include "live.h"
-#include "lttng-relayd.h"
-#include "session.h"
-#include "stream.h"
-#include "testpoint.h"
-#include "utils.h"
-#include "viewer-session.h"
-#include "viewer-stream.h"
+#include "cmd.hpp"
+#include "connection.hpp"
+#include "ctf-trace.hpp"
+#include "health-relayd.hpp"
+#include "live.hpp"
+#include "lttng-relayd.hpp"
+#include "session.hpp"
+#include "stream.hpp"
+#include "testpoint.hpp"
+#include "utils.hpp"
+#include "viewer-session.hpp"
+#include "viewer-stream.hpp"
 
 #define SESSION_BUF_DEFAULT_COUNT	16
 
@@ -970,7 +970,7 @@ void *thread_dispatcher(void *data __attribute__((unused)))
 				/* Continue thread execution */
 				break;
 			}
-			conn = caa_container_of(node, struct relay_connection, qnode);
+			conn = lttng::utils::container_of(node, &relay_connection::qnode);
 			DBG("Dispatching viewer request waiting on sock %d",
 					conn->sock->fd);
 
@@ -1112,7 +1112,7 @@ int viewer_list_sessions(struct relay_connection *conn)
 	uint32_t buf_count = SESSION_BUF_DEFAULT_COUNT;
 	uint32_t count = 0;
 
-	send_session_buf = (lttng_viewer_session *) zmalloc(SESSION_BUF_DEFAULT_COUNT * sizeof(*send_session_buf));
+	send_session_buf = calloc<lttng_viewer_session>(SESSION_BUF_DEFAULT_COUNT);
 	if (!send_session_buf) {
 		return -1;
 	}
@@ -1271,7 +1271,7 @@ int viewer_get_new_streams(struct relay_connection *conn)
 		 * 'ret' to close the connection.
 		 */
 		response.status = htobe32(LTTNG_VIEWER_NEW_STREAMS_ERR);
-		goto send_reply;
+		goto send_reply_unlock;
 	}
 	send_streams = 1;
 	response.status = htobe32(LTTNG_VIEWER_NEW_STREAMS_OK);
@@ -2115,7 +2115,7 @@ int viewer_get_packet(struct relay_connection *conn)
 		reply_size += packet_data_len;
 	}
 
-	reply = (char *) zmalloc(reply_size);
+	reply = zmalloc<char>(reply_size);
 	if (!reply) {
 		get_packet_status = LTTNG_VIEWER_GET_PACKET_ERR;
 		PERROR("Falled to allocate reply, returning status=%s",
@@ -2378,7 +2378,7 @@ int viewer_get_metadata(struct relay_connection *conn)
 	}
 
 	reply.len = htobe64(len);
-	data = (char *) zmalloc(len);
+	data = zmalloc<char>(len);
 	if (!data) {
 		PERROR("viewer metadata zmalloc");
 		goto error;