X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2Fviewer-stream.c;h=494b0e6211d22db194bb60ae6d9b7d30a8b99434;hb=a0377dfefe40662ba7d68617bce6ff467114136c;hp=511eaad93afbb23a6c2799eeb3a154e867b7d4bf;hpb=71381736573d0779956f4a0bc7d206acc98cd3cb;p=lttng-tools.git

diff --git a/src/bin/lttng-relayd/viewer-stream.c b/src/bin/lttng-relayd/viewer-stream.c
index 511eaad93..494b0e621 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);
+
+		LTTNG_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");
@@ -119,7 +122,7 @@ struct relay_viewer_stream *viewer_stream_create(struct relay_stream *stream,
 	 */
 	if (stream->index_file == NULL) {
 		vstream->index_file = NULL;
-	} else {
+	} else if (vstream->stream_file.trace_chunk) {
 		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;
@@ -147,7 +150,7 @@ struct relay_viewer_stream *viewer_stream_create(struct relay_stream *stream,
 	 * If we never received a data file for the current stream, delay the
 	 * opening, otherwise open it right now.
 	 */
-	if (stream->file) {
+	if (stream->file && vstream->stream_file.trace_chunk) {
 		int ret;
 		char file_path[LTTNG_PATH_MAX];
 		enum lttng_trace_chunk_status status;
@@ -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);
@@ -194,9 +199,6 @@ error:
 	if (vstream) {
 		viewer_stream_destroy(vstream);
 	}
-	if (trace_chunk && acquired_reference) {
-		lttng_trace_chunk_put(trace_chunk);
-	}
 	return NULL;
 }
 
@@ -207,7 +209,7 @@ static void viewer_stream_unpublish(struct relay_viewer_stream *vstream)
 
 	iter.iter.node = &vstream->stream_n.node;
 	ret = lttng_ht_del(viewer_streams_ht, &iter);
-	assert(!ret);
+	LTTNG_ASSERT(!ret);
 }
 
 static void viewer_stream_release(struct urcu_ref *ref)
@@ -345,7 +347,7 @@ int viewer_stream_rotate(struct relay_viewer_stream *vstream)
 		 * has been data written at some point, which will have set the
 		 * tail.
 		 */
-		assert(seq_tail != -1ULL);
+		LTTNG_ASSERT(seq_tail != -1ULL);
 		/*
 		 * We need to resync because we lag behind tail.
 		 */