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=60aa4371d5cc446bb4dac4bdd654e13d45adc9ea;hb=3ff5c5db220d92baf64280ba54713fcafe76142e;hpb=ce4d40839ac3beef1a58730d3636a522497bc60f

diff --git a/src/bin/lttng-relayd/viewer-stream.c b/src/bin/lttng-relayd/viewer-stream.c
index 60aa4371d..70654c797 100644
--- a/src/bin/lttng-relayd/viewer-stream.c
+++ b/src/bin/lttng-relayd/viewer-stream.c
@@ -41,9 +41,16 @@ 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;
+	struct relay_viewer_stream *vstream = NULL;
+	const bool acquired_reference = lttng_trace_chunk_get(
+			viewer_trace_chunk);
+
+	if (!acquired_reference) {
+		goto error;
+	}
 
 	vstream = zmalloc(sizeof(*vstream));
 	if (!vstream) {
@@ -51,6 +58,8 @@ struct relay_viewer_stream *viewer_stream_create(struct relay_stream *stream,
 		goto error;
 	}
 
+	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");
@@ -96,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.
@@ -118,12 +127,26 @@ struct relay_viewer_stream *viewer_stream_create(struct relay_stream *stream,
 	if (stream->index_received_seqcount == 0) {
 		vstream->index_file = NULL;
 	} else {
-		vstream->index_file = lttng_index_file_open(vstream->path_name,
-				vstream->channel_name,
-				stream->tracefile_count,
-				vstream->current_tracefile_id);
-		if (!vstream->index_file) {
-			goto error_unlock;
+		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;
+
+		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),
+				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;
+			}
 		}
 	}
 
@@ -143,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;
 
@@ -155,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;
 }
 
@@ -179,9 +204,9 @@ static void viewer_stream_release(struct urcu_ref *ref)
 
 	viewer_stream_unpublish(vstream);
 
-	if (vstream->stream_fd) {
-		stream_fd_put(vstream->stream_fd);
-		vstream->stream_fd = NULL;
+	if (vstream->stream_file.fd) {
+		stream_fd_put(vstream->stream_file.fd);
+		vstream->stream_file.fd = NULL;
 	}
 	if (vstream->index_file) {
 		lttng_index_file_put(vstream->index_file);
@@ -191,6 +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);
 }
 
@@ -243,8 +270,11 @@ void viewer_stream_put(struct relay_viewer_stream *vstream)
 int viewer_stream_rotate(struct relay_viewer_stream *vstream)
 {
 	int ret;
-	struct relay_stream *stream = vstream->stream;
 	uint64_t new_id;
+	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
@@ -289,16 +319,22 @@ int viewer_stream_rotate(struct relay_viewer_stream *vstream)
 		lttng_index_file_put(vstream->index_file);
 		vstream->index_file = NULL;
 	}
-	if (vstream->stream_fd) {
-		stream_fd_put(vstream->stream_fd);
-		vstream->stream_fd = NULL;
+	if (vstream->stream_file.fd) {
+		stream_fd_put(vstream->stream_file.fd);
+		vstream->stream_file.fd = NULL;
 	}
-
-	vstream->index_file = lttng_index_file_open(vstream->path_name,
-			vstream->channel_name,
-			stream->tracefile_count,
-			vstream->current_tracefile_id);
-	if (!vstream->index_file) {
+	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),
+					true, &vstream->index_file);
+	if (chunk_status != LTTNG_TRACE_CHUNK_STATUS_OK) {
 		ret = -1;
 		goto end;
 	} else {