Fix: relayd: session id is ignored by 2.11+ create session command

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

diff --git a/src/bin/lttng-relayd/stream.cpp b/src/bin/lttng-relayd/stream.cpp
index 15800929552fe56242628a7e51a7b79bbc727920..65a8ce11abf95a9c8b45a7077c06f5db94cd535a 100644 (file)
--- a/src/bin/lttng-relayd/stream.cpp
+++ b/src/bin/lttng-relayd/stream.cpp
@@ -31,6 +31,8 @@
 /* Should be called with RCU read-side lock held. */
 bool stream_get(struct relay_stream *stream)
 {
+       ASSERT_RCU_READ_LOCKED();
+
        return urcu_ref_get_unless_zero(&stream->ref);
 }
 
@@ -71,7 +73,7 @@ static void stream_complete_rotation(struct relay_stream *stream)
        }
        lttng_trace_chunk_put(stream->trace_chunk);
        stream->trace_chunk = stream->ongoing_rotation.value.next_trace_chunk;
-       stream->ongoing_rotation = (typeof(stream->ongoing_rotation)) {};
+       stream->ongoing_rotation = LTTNG_OPTIONAL_INIT_UNSET;
        stream->completed_rotation_count++;
 }
 
@@ -261,7 +263,7 @@ static int rotate_truncate_stream(struct relay_stream *stream)
        while (copy_bytes_left) {
                ssize_t io_ret;
                char copy_buffer[FILE_IO_STACK_BUFFER_SIZE];
-               const off_t copy_size_this_pass = std::min(copy_bytes_left, sizeof(copy_buffer));
+               const off_t copy_size_this_pass = std::min<uint64_t>(copy_bytes_left, sizeof(copy_buffer));
 
                io_ret = fs_handle_read(previous_stream_file, copy_buffer,
                                copy_size_this_pass);