common: index and trace-chunk file creation/open API change

[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 21294d1f32dfc700c33c1075b1343e36b84c2833..70654c79710c19a17f9e3a30d3795156fbfed1f9 100644 (file)
--- a/src/bin/lttng-relayd/viewer-stream.c
+++ b/src/bin/lttng-relayd/viewer-stream.c
@@ -41,11 +41,12 @@ static void viewer_stream_destroy_rcu(struct rcu_head *head)
 }
 
 struct relay_viewer_stream *viewer_stream_create(struct relay_stream *stream,
+               struct lttng_trace_chunk *viewer_trace_chunk,
                enum lttng_viewer_seek seek_t)
 {
        struct relay_viewer_stream *vstream = NULL;
        const bool acquired_reference = lttng_trace_chunk_get(
-                       stream->trace_chunk);
+                       viewer_trace_chunk);
 
        if (!acquired_reference) {
                goto error;
@@ -57,7 +58,8 @@ struct relay_viewer_stream *viewer_stream_create(struct relay_stream *stream,
                goto error;
        }
 
-       vstream->stream_file.trace_chunk = stream->trace_chunk;
+       vstream->stream_file.trace_chunk = viewer_trace_chunk;
+       viewer_trace_chunk = NULL;
        vstream->path_name = lttng_strndup(stream->path_name, LTTNG_VIEWER_PATH_MAX);
        if (vstream->path_name == NULL) {
                PERROR("relay viewer path_name alloc");
@@ -103,7 +105,7 @@ struct relay_viewer_stream *viewer_stream_create(struct relay_stream *stream,
        }
        case LTTNG_VIEWER_SEEK_LAST:
                vstream->current_tracefile_id =
-                       tracefile_array_get_file_index_head(stream->tfa);
+                       tracefile_array_get_read_file_index_head(stream->tfa);
                /*
                 * We seek at the very end of each stream, awaiting for
                 * a future packet to eventually come in.
@@ -127,17 +129,24 @@ 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(
-                               stream->trace_chunk, stream->path_name,
+               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,
                                vstream->current_tracefile_id,
                                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;
+                       }
                }
        }
 
@@ -157,9 +166,8 @@ struct relay_viewer_stream *viewer_stream_create(struct relay_stream *stream,
 
        /* Globally visible after the add unique. */
        lttng_ht_node_init_u64(&vstream->stream_n, stream->stream_handle);
-       lttng_ht_add_unique_u64(viewer_streams_ht, &vstream->stream_n);
-
        urcu_ref_init(&vstream->ref);
+       lttng_ht_add_unique_u64(viewer_streams_ht, &vstream->stream_n);
 
        return vstream;
 
@@ -169,6 +177,9 @@ error:
        if (vstream) {
                viewer_stream_destroy(vstream);
        }
+       if (viewer_trace_chunk && acquired_reference) {
+               lttng_trace_chunk_put(viewer_trace_chunk);
+       }
        return NULL;
 }
 
@@ -206,6 +217,7 @@ static void viewer_stream_release(struct urcu_ref *ref)
                vstream->stream = NULL;
        }
        lttng_trace_chunk_put(vstream->stream_file.trace_chunk);
+       vstream->stream_file.trace_chunk = NULL;
        call_rcu(&vstream->rcu_node, viewer_stream_destroy_rcu);
 }
 
@@ -262,6 +274,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
@@ -310,17 +323,18 @@ 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(
-                                       stream->trace_chunk, stream->path_name,
+       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,
                                        vstream->current_tracefile_id,
                                        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 {