common: replace container_of with a C++ safe implementation

[lttng-tools.git] / src / bin / lttng-sessiond / consumer.cpp

diff --git a/src/bin/lttng-sessiond/consumer.cpp b/src/bin/lttng-sessiond/consumer.cpp
index 3637cb2e57348c7a8fafa17687a1d18a78d0f22d..c0f8eb5894e8fae8cb070109d4820ebec62ddff2 100644 (file)
--- a/src/bin/lttng-sessiond/consumer.cpp
+++ b/src/bin/lttng-sessiond/consumer.cpp
@@ -15,17 +15,17 @@
 #include <unistd.h>
 #include <inttypes.h>
 
-#include <common/common.h>
-#include <common/defaults.h>
-#include <common/uri.h>
-#include <common/relayd/relayd.h>
-#include <common/string-utils/format.h>
-
-#include "consumer.h"
-#include "health-sessiond.h"
-#include "ust-app.h"
-#include "utils.h"
-#include "lttng-sessiond.h"
+#include <common/common.hpp>
+#include <common/defaults.hpp>
+#include <common/uri.hpp>
+#include <common/relayd/relayd.hpp>
+#include <common/string-utils/format.hpp>
+
+#include "consumer.hpp"
+#include "health-sessiond.hpp"
+#include "ust-app.hpp"
+#include "utils.hpp"
+#include "lttng-sessiond.hpp"
 
 /*
  * Return allocated full pathname of the session using the consumer trace path
@@ -49,7 +49,7 @@ char *setup_channel_trace_path(struct consumer_output *consumer,
         * Allocate the string ourself to make sure we never exceed
         * LTTNG_PATH_MAX.
         */
-       pathname = (char *) zmalloc(LTTNG_PATH_MAX);
+       pathname = calloc<char>(LTTNG_PATH_MAX);
        if (!pathname) {
                goto error;
        }
@@ -414,7 +414,7 @@ struct consumer_socket *consumer_find_socket(int key,
                        &iter);
        node = lttng_ht_iter_get_node_ulong(&iter);
        if (node != NULL) {
-               socket = caa_container_of(node, struct consumer_socket, node);
+               socket = lttng::utils::container_of(node, &consumer_socket::node);
        }
 
        return socket;
@@ -429,7 +429,7 @@ struct consumer_socket *consumer_allocate_socket(int *fd)
 
        LTTNG_ASSERT(fd);
 
-       socket = (consumer_socket *) zmalloc(sizeof(struct consumer_socket));
+       socket = zmalloc<consumer_socket>();
        if (socket == NULL) {
                PERROR("zmalloc consumer socket");
                goto error;
@@ -481,9 +481,9 @@ void consumer_del_socket(struct consumer_socket *sock,
 static void destroy_socket_rcu(struct rcu_head *head)
 {
        struct lttng_ht_node_ulong *node =
-               caa_container_of(head, struct lttng_ht_node_ulong, head);
+               lttng::utils::container_of(head, &lttng_ht_node_ulong::head);
        struct consumer_socket *socket =
-               caa_container_of(node, struct consumer_socket, node);
+               lttng::utils::container_of(node, &consumer_socket::node);
 
        free(socket);
 }
@@ -520,7 +520,7 @@ struct consumer_output *consumer_create_output(enum consumer_dst_type type)
 {
        struct consumer_output *output = NULL;
 
-       output = (consumer_output *) zmalloc(sizeof(struct consumer_output));
+       output = zmalloc<consumer_output>();
        if (output == NULL) {
                PERROR("zmalloc consumer_output");
                goto error;
@@ -566,7 +566,7 @@ void consumer_destroy_output_sockets(struct consumer_output *obj)
 static void consumer_release_output(struct urcu_ref *ref)
 {
        struct consumer_output *obj =
-               caa_container_of(ref, struct consumer_output, ref);
+               lttng::utils::container_of(ref, &consumer_output::ref);
 
        consumer_destroy_output_sockets(obj);
 
@@ -924,7 +924,7 @@ void consumer_init_ask_channel_comm_msg(struct lttcomm_consumer_msg *msg,
                const char *name,
                uint64_t relayd_id,
                uint64_t key,
-               unsigned char *uuid,
+               const lttng_uuid& uuid,
                uint32_t chan_id,
                uint64_t tracefile_size,
                uint64_t tracefile_count,
@@ -979,7 +979,7 @@ void consumer_init_ask_channel_comm_msg(struct lttcomm_consumer_msg *msg,
        msg->u.ask_channel.ust_app_uid = ust_app_uid;
        msg->u.ask_channel.blocking_timeout = blocking_timeout;
 
-       memcpy(msg->u.ask_channel.uuid, uuid, sizeof(msg->u.ask_channel.uuid));
+       std::copy(uuid.begin(), uuid.end(), msg->u.ask_channel.uuid);
 
        if (pathname) {
                strncpy(msg->u.ask_channel.pathname, pathname,
@@ -1009,8 +1009,6 @@ void consumer_init_add_channel_comm_msg(struct lttcomm_consumer_msg *msg,
                uint64_t channel_key,
                uint64_t session_id,
                const char *pathname,
-               uid_t uid,
-               gid_t gid,
                uint64_t relayd_id,
                const char *name,
                unsigned int nb_init_streams,
@@ -1507,7 +1505,7 @@ end:
  */
 enum lttng_error_code consumer_snapshot_channel(struct consumer_socket *socket,
                uint64_t key, const struct consumer_output *output, int metadata,
-               uid_t uid, gid_t gid, const char *channel_path, int wait,
+               const char *channel_path,
                uint64_t nb_packets_per_stream)
 {
        int ret;
@@ -1687,7 +1685,7 @@ end:
  * chunk each stream is currently writing to (for the rotate_pending operation).
  */
 int consumer_rotate_channel(struct consumer_socket *socket, uint64_t key,
-               uid_t uid, gid_t gid, struct consumer_output *output,
+               struct consumer_output *output,
                bool is_metadata_channel)
 {
        int ret;
@@ -1733,6 +1731,7 @@ int consumer_open_channel_packets(struct consumer_socket *socket, uint64_t key)
        int ret;
        lttcomm_consumer_msg msg = {
                .cmd_type = LTTNG_CONSUMER_OPEN_CHANNEL_PACKETS,
+               .u = {},
        };
        msg.u.open_channel_packets.key = key;
 
@@ -1783,17 +1782,18 @@ error_socket:
 }
 
 int consumer_init(struct consumer_socket *socket,
-               const lttng_uuid sessiond_uuid)
+               const lttng_uuid& sessiond_uuid)
 {
        int ret;
        struct lttcomm_consumer_msg msg = {
                .cmd_type = LTTNG_CONSUMER_INIT,
+               .u = {},
        };
 
        LTTNG_ASSERT(socket);
 
        DBG("Sending consumer initialization command");
-       lttng_uuid_copy(msg.u.init.sessiond_uuid, sessiond_uuid);
+       std::copy(sessiond_uuid.begin(), sessiond_uuid.end(), msg.u.init.sessiond_uuid);
 
        health_code_update();
        ret = consumer_send_msg(socket, &msg);
@@ -1832,6 +1832,7 @@ int consumer_create_trace_chunk(struct consumer_socket *socket,
        enum lttng_trace_chunk_status tc_status;
        struct lttcomm_consumer_msg msg = {
                .cmd_type = LTTNG_CONSUMER_CREATE_TRACE_CHUNK,
+               .u = {},
        };
        msg.u.create_trace_chunk.session_id = session_id;
 
@@ -1986,6 +1987,7 @@ int consumer_close_trace_chunk(struct consumer_socket *socket,
        enum lttng_trace_chunk_status chunk_status;
        lttcomm_consumer_msg msg = {
                .cmd_type = LTTNG_CONSUMER_CLOSE_TRACE_CHUNK,
+               .u = {},
        };
        msg.u.close_trace_chunk.session_id = session_id;
 
@@ -2112,6 +2114,7 @@ int consumer_trace_chunk_exists(struct consumer_socket *socket,
        enum lttng_trace_chunk_status chunk_status;
        lttcomm_consumer_msg msg = {
                .cmd_type = LTTNG_CONSUMER_TRACE_CHUNK_EXISTS,
+               .u = {},
        };
        msg.u.trace_chunk_exists.session_id = session_id;