Make lttng_directory_handle reference countable

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

diff --git a/src/bin/lttng-sessiond/consumer.c b/src/bin/lttng-sessiond/consumer.c
index 53f7c3946e859fd6c1c4a7581db12415ba5f8121..c4cfb2fd7af8640cceb63e39e57cb7aa703a8a49 100644 (file)
--- a/src/bin/lttng-sessiond/consumer.c
+++ b/src/bin/lttng-sessiond/consumer.c
@@ -1151,9 +1151,10 @@ int consumer_send_relayd_socket(struct consumer_socket *consumer_sock,
 
        if (type == LTTNG_STREAM_CONTROL) {
                char output_path[LTTNG_PATH_MAX] = {};
+               uint64_t relayd_session_id;
 
                ret = relayd_create_session(rsock,
-                               &msg.u.relayd_sock.relayd_session_id,
+                               &relayd_session_id,
                                session_name, hostname, base_path,
                                session_live_timer,
                                consumer->snapshot, session_id,
@@ -1166,6 +1167,7 @@ int consumer_send_relayd_socket(struct consumer_socket *consumer_sock,
                        (void) relayd_close(rsock);
                        goto error;
                }
+               msg.u.relayd_sock.relayd_session_id = relayd_session_id;
                DBG("Created session on relay, output path reply: %s",
                        output_path);
        }
@@ -1188,7 +1190,7 @@ int consumer_send_relayd_socket(struct consumer_socket *consumer_sock,
        }
 
        DBG3("Sending relayd socket file descriptor to consumer");
-       ret = consumer_send_fds(consumer_sock, &rsock->sock.fd, 1);
+       ret = consumer_send_fds(consumer_sock, ALIGNED_CONST_PTR(rsock->sock.fd), 1);
        if (ret < 0) {
                goto error;
        }
@@ -1828,7 +1830,7 @@ int consumer_create_trace_chunk(struct consumer_socket *socket,
        msg.u.create_trace_chunk.chunk_id = chunk_id;
 
        if (chunk_has_local_output) {
-               chunk_status = lttng_trace_chunk_get_chunk_directory_handle(
+               chunk_status = lttng_trace_chunk_borrow_chunk_directory_handle(
                                chunk, &chunk_directory_handle);
                if (chunk_status != LTTNG_TRACE_CHUNK_STATUS_OK) {
                        ret = -LTTNG_ERR_FATAL;