X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2Flttng-relayd.h;h=6840aba31edda4c7c2181613ce35c06d081ca73f;hb=157df58664846e22bdeea84dfcf717cb43360b3f;hp=8039a7ec703d01f4672d32abcc9448ed49fb017a;hpb=6b6b9a5a667d6713eb7bcf22daf4f9bbeef00fb1;p=lttng-tools.git

diff --git a/src/bin/lttng-relayd/lttng-relayd.h b/src/bin/lttng-relayd/lttng-relayd.h
index 8039a7ec7..6840aba31 100644
--- a/src/bin/lttng-relayd/lttng-relayd.h
+++ b/src/bin/lttng-relayd/lttng-relayd.h
@@ -25,7 +25,7 @@
 #include <urcu/wfqueue.h>
 
 #include <common/hashtable/hashtable.h>
-#include <common/index/lttng-index.h>
+#include <common/index/ctf-index.h>
 
 #include "ctf-trace.h"
 
@@ -163,9 +163,18 @@ struct relay_viewer_stream {
 	uint64_t total_index_received;
 	uint64_t tracefile_count;
 	uint64_t tracefile_count_current;
+	/* Stop after reading this tracefile. */
+	uint64_t tracefile_count_last;
 	struct lttng_ht_node_u64 stream_n;
 	struct rcu_head rcu_node;
 	struct ctf_trace *ctf_trace;
+	/*
+	 * This lock blocks only when the writer is about to start overwriting
+	 * a file currently read by the reader.
+	 *
+	 * This is nested INSIDE the viewer_stream_rotation_lock.
+	 */
+	pthread_mutex_t overwrite_lock;
 	/* Information telling us if the stream is a metadata stream. */
 	unsigned int metadata_flag:1;
 	/*