relayd: viewer-stream: introduce viewer_stream_close_files and viewer_stream_sync_tra...

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

diff --git a/src/bin/lttng-relayd/viewer-stream.c b/src/bin/lttng-relayd/viewer-stream.c
index acd488b61846202813e8a7efe07898c1f67cfef7..42431a8fa3588fc20a5745f80c0e54ecb5887545 100644 (file)
--- a/src/bin/lttng-relayd/viewer-stream.c
+++ b/src/bin/lttng-relayd/viewer-stream.c
@@ -129,8 +129,9 @@ struct relay_viewer_stream *viewer_stream_create(struct relay_stream *stream,
        } else {
                const uint32_t connection_major = stream->trace->session->major;
                const uint32_t connection_minor = stream->trace->session->minor;
+               enum lttng_trace_chunk_status chunk_status;
 
-               vstream->index_file = lttng_index_file_create_from_trace_chunk_read_only(
+               chunk_status = lttng_index_file_create_from_trace_chunk_read_only(
                                vstream->stream_file.trace_chunk,
                                stream->path_name,
                                stream->channel_name, stream->tracefile_size,
@@ -138,9 +139,14 @@ struct relay_viewer_stream *viewer_stream_create(struct relay_stream *stream,
                                lttng_to_index_major(connection_major,
                                                connection_minor),
                                lttng_to_index_minor(connection_major,
-                                               connection_minor));
-               if (!vstream->index_file) {
-                       goto error_unlock;
+                                               connection_minor),
+                               true, &vstream->index_file);
+               if (chunk_status != LTTNG_TRACE_CHUNK_STATUS_OK) {
+                       if (chunk_status == LTTNG_TRACE_CHUNK_STATUS_NO_FILE) {
+                               vstream->index_file = NULL;
+                       } else {
+                               goto error_unlock;
+                       }
                }
        }
 
@@ -255,6 +261,31 @@ void viewer_stream_put(struct relay_viewer_stream *vstream)
        rcu_read_unlock();
 }
 
+void viewer_stream_close_files(struct relay_viewer_stream *vstream)
+{
+       if (vstream->index_file) {
+               lttng_index_file_put(vstream->index_file);
+               vstream->index_file = NULL;
+       }
+       if (vstream->stream_file.fd) {
+               stream_fd_put(vstream->stream_file.fd);
+               vstream->stream_file.fd = NULL;
+       }
+}
+
+void viewer_stream_sync_tracefile_array_tail(struct relay_viewer_stream *vstream)
+{
+       const struct relay_stream *stream = vstream->stream;
+       uint64_t seq_tail;
+
+       vstream->current_tracefile_id = tracefile_array_get_file_index_tail(stream->tfa);
+       seq_tail = tracefile_array_get_seq_tail(stream->tfa);
+       if (seq_tail == -1ULL) {
+               seq_tail = 0;
+       }
+       vstream->index_sent_seqcount = seq_tail;
+}
+
 /*
  * Rotate a stream to the next tracefile.
  *
@@ -268,6 +299,7 @@ int viewer_stream_rotate(struct relay_viewer_stream *vstream)
        const struct relay_stream *stream = vstream->stream;
        const uint32_t connection_major = stream->trace->session->major;
        const uint32_t connection_minor = stream->trace->session->minor;
+       enum lttng_trace_chunk_status chunk_status;
 
        /* Detect the last tracefile to open. */
        if (stream->index_received_seqcount
@@ -316,8 +348,7 @@ int viewer_stream_rotate(struct relay_viewer_stream *vstream)
                stream_fd_put(vstream->stream_file.fd);
                vstream->stream_file.fd = NULL;
        }
-       vstream->index_file =
-                       lttng_index_file_create_from_trace_chunk_read_only(
+       chunk_status = lttng_index_file_create_from_trace_chunk_read_only(
                                        vstream->stream_file.trace_chunk,
                                        stream->path_name,
                                        stream->channel_name,
@@ -326,8 +357,9 @@ int viewer_stream_rotate(struct relay_viewer_stream *vstream)
                                        lttng_to_index_major(connection_major,
                                                        connection_minor),
                                        lttng_to_index_minor(connection_major,
-                                                       connection_minor));
-       if (!vstream->index_file) {
+                                                       connection_minor),
+                                       true, &vstream->index_file);
+       if (chunk_status != LTTNG_TRACE_CHUNK_STATUS_OK) {
                ret = -1;
                goto end;
        } else {