Build fix: missing initializer for member 'rotation_positions'

[lttng-tools.git] / src / bin / lttng-relayd / main.cpp

diff --git a/src/bin/lttng-relayd/main.cpp b/src/bin/lttng-relayd/main.cpp
index 99f7920103df184faf75075d7db9ce47979f6422..318af66f787526f049faef36f9c4cf1a78425c71 100644 (file)
--- a/src/bin/lttng-relayd/main.cpp
+++ b/src/bin/lttng-relayd/main.cpp
@@ -36,45 +36,45 @@
 #include <algorithm>
 
 #include <lttng/lttng.h>
-#include <common/common.h>
-#include <common/compat/poll.h>
-#include <common/compat/socket.h>
-#include <common/compat/endian.h>
-#include <common/compat/getenv.h>
-#include <common/defaults.h>
-#include <common/daemonize.h>
-#include <common/futex.h>
-#include <common/sessiond-comm/sessiond-comm.h>
-#include <common/sessiond-comm/inet.h>
-#include <common/sessiond-comm/relayd.h>
-#include <common/uri.h>
-#include <common/utils.h>
-#include <common/path.h>
-#include <common/align.h>
-#include <common/ini-config/ini-config.h>
-#include <common/dynamic-buffer.h>
-#include <common/buffer-view.h>
-#include <common/string-utils/format.h>
-#include <common/fd-tracker/fd-tracker.h>
-#include <common/fd-tracker/utils.h>
-
-#include "backward-compatibility-group-by.h"
-#include "cmd.h"
-#include "connection.h"
-#include "ctf-trace.h"
-#include "health-relayd.h"
-#include "index.h"
-#include "live.h"
-#include "lttng-relayd.h"
-#include "session.h"
-#include "sessiond-trace-chunks.h"
-#include "stream.h"
-#include "tcp_keep_alive.h"
-#include "testpoint.h"
-#include "tracefile-array.h"
-#include "utils.h"
-#include "version.h"
-#include "viewer-stream.h"
+#include <common/common.hpp>
+#include <common/compat/poll.hpp>
+#include <common/compat/socket.hpp>
+#include <common/compat/endian.hpp>
+#include <common/compat/getenv.hpp>
+#include <common/defaults.hpp>
+#include <common/daemonize.hpp>
+#include <common/futex.hpp>
+#include <common/sessiond-comm/sessiond-comm.hpp>
+#include <common/sessiond-comm/inet.hpp>
+#include <common/sessiond-comm/relayd.hpp>
+#include <common/uri.hpp>
+#include <common/utils.hpp>
+#include <common/path.hpp>
+#include <common/align.hpp>
+#include <common/ini-config/ini-config.hpp>
+#include <common/dynamic-buffer.hpp>
+#include <common/buffer-view.hpp>
+#include <common/string-utils/format.hpp>
+#include <common/fd-tracker/fd-tracker.hpp>
+#include <common/fd-tracker/utils.hpp>
+
+#include "backward-compatibility-group-by.hpp"
+#include "cmd.hpp"
+#include "connection.hpp"
+#include "ctf-trace.hpp"
+#include "health-relayd.hpp"
+#include "index.hpp"
+#include "live.hpp"
+#include "lttng-relayd.hpp"
+#include "session.hpp"
+#include "sessiond-trace-chunks.hpp"
+#include "stream.hpp"
+#include "tcp_keep_alive.hpp"
+#include "testpoint.hpp"
+#include "tracefile-array.hpp"
+#include "utils.hpp"
+#include "version.hpp"
+#include "viewer-stream.hpp"
 
 static const char *help_msg =
 #ifdef LTTNG_EMBED_HELP
@@ -1329,7 +1329,7 @@ static void *relay_thread_dispatcher(void *data __attribute__((unused)))
                                /* Continue thread execution */
                                break;
                        }
-                       new_conn = caa_container_of(node, struct relay_connection, qnode);
+                       new_conn = lttng::utils::container_of(node, &relay_connection::qnode);
 
                        DBG("Dispatching request waiting on sock %d", new_conn->sock->fd);
 
@@ -2539,11 +2539,14 @@ static ssize_t relay_unpack_rotate_streams_header(
         * We start by "unpacking" `stream_count` to figure out the padding length
         * emited by our peer.
         */
-       memcpy(&rotate_streams.stream_count, payload->data,
-                       sizeof(rotate_streams.stream_count));
-       rotate_streams = (typeof(rotate_streams)) {
-               .stream_count = be32toh(rotate_streams.stream_count),
-       };
+       {
+               decltype(rotate_streams.stream_count) stream_count;
+
+               memcpy(&stream_count, payload->data, sizeof(stream_count));
+               rotate_streams.stream_count = be32toh(stream_count);
+       }
+
+       rotate_streams.new_chunk_id = LTTNG_OPTIONAL_INIT_UNSET;
 
        /*
         * Payload size expected given the possible padding lengths in
@@ -2573,13 +2576,11 @@ static ssize_t relay_unpack_rotate_streams_header(
                memcpy(&packed_rotate_streams, payload->data, header_len);
 
                /* Unpack the packed structure to the natively-packed version. */
-               *_rotate_streams = (typeof(*_rotate_streams)) {
-                       .stream_count = be32toh(packed_rotate_streams.stream_count),
-                       .new_chunk_id = (typeof(_rotate_streams->new_chunk_id)) {
-                               .is_set = !!packed_rotate_streams.new_chunk_id.is_set,
-                               .value = be64toh(packed_rotate_streams.new_chunk_id.value),
-                       }
+               _rotate_streams->new_chunk_id = (typeof(_rotate_streams->new_chunk_id)){
+                       .is_set = !!packed_rotate_streams.new_chunk_id.is_set,
+                       .value = be64toh(packed_rotate_streams.new_chunk_id.value),
                };
+               _rotate_streams->stream_count = be32toh(packed_rotate_streams.stream_count);
        } else if (payload->size == expected_payload_size_3_bytes_padding) {
                struct lttcomm_relayd_rotate_streams_3_bytes_padding padded_rotate_streams;
 
@@ -2589,13 +2590,11 @@ static ssize_t relay_unpack_rotate_streams_header(
                memcpy(&padded_rotate_streams, payload->data, header_len);
 
                /* Unpack the 3-byte padded structure to the natively-packed version. */
-               *_rotate_streams = (typeof(*_rotate_streams)) {
-                       .stream_count = be32toh(padded_rotate_streams.stream_count),
-                       .new_chunk_id = (typeof(_rotate_streams->new_chunk_id)) {
-                               .is_set = !!padded_rotate_streams.new_chunk_id.is_set,
-                               .value = be64toh(padded_rotate_streams.new_chunk_id.value),
-                       }
+               _rotate_streams->new_chunk_id = (typeof(_rotate_streams->new_chunk_id)){
+                       .is_set = !!padded_rotate_streams.new_chunk_id.is_set,
+                       .value = be64toh(padded_rotate_streams.new_chunk_id.value),
                };
+               _rotate_streams->stream_count = be32toh(padded_rotate_streams.stream_count);
        } else if (payload->size == expected_payload_size_7_bytes_padding) {
                struct lttcomm_relayd_rotate_streams_7_bytes_padding padded_rotate_streams;
 
@@ -2605,13 +2604,11 @@ static ssize_t relay_unpack_rotate_streams_header(
                memcpy(&padded_rotate_streams, payload->data, header_len);
 
                /* Unpack the 7-byte padded structure to the natively-packed version. */
-               *_rotate_streams = (typeof(*_rotate_streams)) {
-                       .stream_count = be32toh(padded_rotate_streams.stream_count),
-                       .new_chunk_id = (typeof(_rotate_streams->new_chunk_id)) {
-                               .is_set = !!padded_rotate_streams.new_chunk_id.is_set,
-                               .value = be64toh(padded_rotate_streams.new_chunk_id.value),
-                       }
+               _rotate_streams->new_chunk_id = (typeof(_rotate_streams->new_chunk_id)){
+                       .is_set = !!padded_rotate_streams.new_chunk_id.is_set,
+                       .value = be64toh(padded_rotate_streams.new_chunk_id.value),
                };
+               _rotate_streams->stream_count = be32toh(padded_rotate_streams.stream_count);
 
                header_len = sizeof(padded_rotate_streams);
        } else {