X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2Fviewer-stream.c;h=67c452eec7d4264139f1134b1fcdd4bc2aa2d49c;hp=f07e062f8d303a6b1aeeb0520a263009a05eae3d;hb=80516611b6f19201b1e173fb448935aca7a9e668;hpb=9edaf114d28249f4740de16bc9f58c43cfe8042e

diff --git a/src/bin/lttng-relayd/viewer-stream.c b/src/bin/lttng-relayd/viewer-stream.c
index f07e062f8..67c452eec 100644
--- a/src/bin/lttng-relayd/viewer-stream.c
+++ b/src/bin/lttng-relayd/viewer-stream.c
@@ -21,6 +21,7 @@
 
 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);
@@ -40,12 +41,8 @@ struct relay_viewer_stream *viewer_stream_create(struct relay_stream *stream,
 		enum lttng_viewer_seek seek_t)
 {
 	struct relay_viewer_stream *vstream = NULL;
-	const bool acquired_reference = lttng_trace_chunk_get(trace_chunk);
 
 	ASSERT_LOCKED(stream->lock);
-	if (!acquired_reference) {
-		goto error;
-	}
 
 	vstream = zmalloc(sizeof(*vstream));
 	if (!vstream) {
@@ -53,8 +50,14 @@ struct relay_viewer_stream *viewer_stream_create(struct relay_stream *stream,
 		goto error;
 	}
 
+	if (trace_chunk) {
+		const bool acquired_reference = lttng_trace_chunk_get(
+				trace_chunk);
+
+		assert(acquired_reference);
+	}
+
 	vstream->stream_file.trace_chunk = trace_chunk;
-	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");
@@ -75,7 +78,7 @@ struct relay_viewer_stream *viewer_stream_create(struct relay_stream *stream,
 
 	if (stream->is_metadata && stream->trace->viewer_metadata_stream) {
 		ERR("Cannot attach viewer metadata stream to trace (busy).");
-		goto error_unlock;
+		goto error;
 	}
 
 	switch (seek_t) {
@@ -110,7 +113,7 @@ struct relay_viewer_stream *viewer_stream_create(struct relay_stream *stream,
 				tracefile_array_get_seq_head(stream->tfa) + 1;
 		break;
 	default:
-		goto error_unlock;
+		goto error;
 	}
 
 	/*
@@ -138,7 +141,7 @@ struct relay_viewer_stream *viewer_stream_create(struct relay_stream *stream,
 			if (chunk_status == LTTNG_TRACE_CHUNK_STATUS_NO_FILE) {
 				vstream->index_file = NULL;
 			} else {
-				goto error_unlock;
+				goto error;
 			}
 		}
 	}
@@ -157,7 +160,7 @@ struct relay_viewer_stream *viewer_stream_create(struct relay_stream *stream,
 				vstream->current_tracefile_id, NULL, file_path,
 				sizeof(file_path));
 		if (ret < 0) {
-			goto error_unlock;
+			goto error;
 		}
 
 		status = lttng_trace_chunk_open_fs_handle(
@@ -165,7 +168,7 @@ struct relay_viewer_stream *viewer_stream_create(struct relay_stream *stream,
 				O_RDONLY, 0, &vstream->stream_file.handle,
 				true);
 		if (status != LTTNG_TRACE_CHUNK_STATUS_OK) {
-			goto error_unlock;
+			goto error;
 		}
 	}
 
@@ -175,7 +178,7 @@ struct relay_viewer_stream *viewer_stream_create(struct relay_stream *stream,
 		lseek_ret = fs_handle_seek(
 				vstream->index_file->file, 0, SEEK_END);
 		if (lseek_ret < 0) {
-			goto error_unlock;
+			goto error;
 		}
 	}
 	if (stream->is_metadata) {
@@ -183,6 +186,8 @@ struct relay_viewer_stream *viewer_stream_create(struct relay_stream *stream,
 				vstream);
 	}
 
+	vstream->last_seen_rotation_count = stream->completed_rotation_count;
+
 	/* Globally visible after the add unique. */
 	lttng_ht_node_init_u64(&vstream->stream_n, stream->stream_handle);
 	urcu_ref_init(&vstream->ref);
@@ -190,15 +195,10 @@ struct relay_viewer_stream *viewer_stream_create(struct relay_stream *stream,
 
 	return vstream;
 
-error_unlock:
-	pthread_mutex_unlock(&stream->lock);
 error:
 	if (vstream) {
 		viewer_stream_destroy(vstream);
 	}
-	if (trace_chunk && acquired_reference) {
-		lttng_trace_chunk_put(trace_chunk);
-	}
 	return NULL;
 }