X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2Fviewer-stream.c;h=70654c79710c19a17f9e3a30d3795156fbfed1f9;hp=25ee35e5cadb97787a23e238dccfbcdae0924820;hb=3ff5c5db220d92baf64280ba54713fcafe76142e;hpb=b66a15d11378bcc42817fcfb8f0aff663e770ba2

diff --git a/src/bin/lttng-relayd/viewer-stream.c b/src/bin/lttng-relayd/viewer-stream.c
index 25ee35e5c..70654c797 100644
--- a/src/bin/lttng-relayd/viewer-stream.c
+++ b/src/bin/lttng-relayd/viewer-stream.c
@@ -27,7 +27,6 @@
 
 static void viewer_stream_destroy(struct relay_viewer_stream *vstream)
 {
-	lttng_trace_chunk_put(vstream->stream_file.trace_chunk);
 	free(vstream->path_name);
 	free(vstream->channel_name);
 	free(vstream);
@@ -106,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.
@@ -130,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,
@@ -139,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;
+			}
 		}
 	}
 
@@ -161,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;
 
@@ -173,7 +177,7 @@ error:
 	if (vstream) {
 		viewer_stream_destroy(vstream);
 	}
-	if (viewer_trace_chunk) {
+	if (viewer_trace_chunk && acquired_reference) {
 		lttng_trace_chunk_put(viewer_trace_chunk);
 	}
 	return NULL;
@@ -212,7 +216,8 @@ static void viewer_stream_release(struct urcu_ref *ref)
 		stream_put(vstream->stream);
 		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);
 }
 
@@ -269,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
@@ -317,8 +323,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,
@@ -327,8 +332,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 {