X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2Fmain.c;h=a6b408a90740943138e43ad69160d34a5395baa6;hb=157df58664846e22bdeea84dfcf717cb43360b3f;hp=70a1948c328cc690e39e4add4d67f4a2a8f2fe44;hpb=cef0f7d51b8025d3ba04e6496242c1cca1641aa6;p=lttng-tools.git

diff --git a/src/bin/lttng-relayd/main.c b/src/bin/lttng-relayd/main.c
index 70a1948c3..a6b408a90 100644
--- a/src/bin/lttng-relayd/main.c
+++ b/src/bin/lttng-relayd/main.c
@@ -800,8 +800,6 @@ void deferred_free_stream(struct rcu_head *head)
 	struct relay_stream *stream =
 		caa_container_of(head, struct relay_stream, rcu_node);
 
-	ctf_trace_try_destroy(stream->ctf_trace);
-
 	free(stream->path_name);
 	free(stream->channel_name);
 	free(stream);
@@ -851,6 +849,7 @@ static void destroy_stream(struct relay_stream *stream)
 		 */
 		pthread_mutex_lock(&stream->viewer_stream_rotation_lock);
 		vstream->total_index_received = stream->total_index_received;
+		vstream->tracefile_count_last = stream->tracefile_count_current;
 		vstream->close_write_flag = 1;
 		pthread_mutex_unlock(&stream->viewer_stream_rotation_lock);
 	}
@@ -864,6 +863,11 @@ static void destroy_stream(struct relay_stream *stream)
 	iter.iter.node = &stream->ctf_trace_node.node;
 	delret = lttng_ht_del(stream->ctf_traces_ht, &iter);
 	assert(!delret);
+
+	if (stream->ctf_trace) {
+		ctf_trace_try_destroy(stream->ctf_trace);
+	}
+
 	call_rcu(&stream->rcu_node, deferred_free_stream);
 	DBG("Closed tracefile %d from close stream", stream->fd);
 }