Fix: sessiond: ODR violation results in memory corruption

[lttng-tools.git] / tests / regression / tools / live / live_test.cpp

diff --git a/tests/regression/tools/live/live_test.cpp b/tests/regression/tools/live/live_test.cpp
index 76d801e9b024ee3fcbcd78e6722dbe0e762fd361..559b9a7b1e8298885ae574090a26683e6058eb82 100644 (file)
--- a/tests/regression/tools/live/live_test.cpp
+++ b/tests/regression/tools/live/live_test.cpp
@@ -9,7 +9,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <common/compat/time.h>
+#include <common/compat/time.hpp>
 #include <sys/types.h>
 #include <inttypes.h>
 #include <stdlib.h>
@@ -24,13 +24,13 @@
 #include <lttng/lttng.h>
 
 #include <urcu/list.h>
-#include <common/common.h>
+#include <common/common.hpp>
 
-#include <bin/lttng-relayd/lttng-viewer-abi.h>
-#include <common/index/ctf-index.h>
+#include <bin/lttng-relayd/lttng-viewer-abi.hpp>
+#include <common/index/ctf-index.hpp>
 
-#include <common/compat/errno.h>
-#include <common/compat/endian.h>
+#include <common/compat/errno.hpp>
+#include <common/compat/endian.hpp>
 
 #define SESSION1 "test1"
 #define RELAYD_URL "net://localhost"
@@ -46,12 +46,13 @@
 LTTNG_EXPORT DEFINE_LTTNG_UST_SIGBUS_STATE();
 #endif
 
-static int control_sock;
+namespace {
 struct live_session *session;
+int control_sock;
 
-static int first_packet_offset;
-static int first_packet_len;
-static int first_packet_stream_id = -1;
+int first_packet_offset;
+int first_packet_len;
+int first_packet_stream_id = -1;
 
 struct viewer_stream {
        uint64_t id;
@@ -68,6 +69,7 @@ struct live_session {
        uint64_t live_timer_interval;
        uint64_t stream_count;
 };
+} /* namespace */
 
 static
 ssize_t lttng_live_recv(int fd, void *buf, size_t len)
@@ -285,7 +287,7 @@ int attach_session(uint64_t id)
        int i;
        ssize_t ret_len;
 
-       session = (live_session *) zmalloc(sizeof(struct live_session));
+       session = zmalloc<live_session>();
        if (!session) {
                goto error;
        }
@@ -327,8 +329,7 @@ int attach_session(uint64_t id)
                diag("Got session stream count == 0");
                goto error;
        }
-       session->streams = (viewer_stream *) zmalloc(session->stream_count *
-                       sizeof(struct viewer_stream));
+       session->streams = calloc<viewer_stream>(session->stream_count);
        if (!session->streams) {
                goto error;
        }
@@ -436,7 +437,7 @@ retry:
                goto error;
        }
 
-       data = (char *) zmalloc(len);
+       data = calloc<char>(len);
        if (!data) {
                PERROR("relay data zmalloc");
                goto error;