X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2Fstream.h;h=dfe15f1a045f28d9bde46a56a50603bf352710a9;hb=c45331c54adddb0fee9e829f620cc289ab93a744;hp=47ae2e8f9927fdcd672a595bf3c20902fd375846;hpb=d3ecc5503007bc81faa8049fac945f163b6356f3;p=lttng-tools.git

diff --git a/src/bin/lttng-relayd/stream.h b/src/bin/lttng-relayd/stream.h
index 47ae2e8f9..dfe15f1a0 100644
--- a/src/bin/lttng-relayd/stream.h
+++ b/src/bin/lttng-relayd/stream.h
@@ -26,6 +26,7 @@
 #include <urcu/list.h>
 
 #include <common/hashtable/hashtable.h>
+#include <common/trace-chunk.h>
 
 #include "session.h"
 #include "stream-fd.h"
@@ -47,8 +48,12 @@ struct relay_stream {
 	 * inside the ctf_trace lock.
 	 */
 	pthread_mutex_t lock;
-	uint64_t prev_seq;		/* previous data sequence number encountered. */
-	uint64_t last_net_seq_num;	/* seq num to encounter before closing. */
+	/* previous data sequence number written to disk. */
+	uint64_t prev_data_seq;
+	/* previous index sequence number written to disk. */
+	uint64_t prev_index_seq;
+	/* seq num to encounter before closing. */
+	uint64_t last_net_seq_num;
 
 	/* FD on which to write the stream data. */
 	struct stream_fd *stream_fd;
@@ -56,6 +61,20 @@ struct relay_stream {
 	struct lttng_index_file *index_file;
 
 	char *path_name;
+	/*
+	 * prev_path_name is only used for session rotation support.
+	 * It is essentially used to work around the fact that index
+	 * files are always created from the 'data' connection.
+	 *
+	 * Hence, it is possible to receive a ROTATE_STREAM command
+	 * which affects the stream's path_name before the creation of
+	 * an index file. In this situation, the index file of the
+	 * 'previous' chunk would be created in the new destination folder.
+	 *
+	 * It would then be unlinked when the actual index of the new chunk
+	 * is created.
+	 */
+	char *prev_path_name;
 	char *channel_name;
 
 	/* On-disk circular buffer of tracefiles. */
@@ -108,7 +127,7 @@ struct relay_stream {
 	bool data_pending_check_done;
 
 	/* Is this stream a metadata stream ? */
-	int32_t is_metadata;
+	bool is_metadata;
 	/* Amount of metadata received (bytes). */
 	uint64_t metadata_received;
 
@@ -144,14 +163,18 @@ struct relay_stream {
 	 */
 	uint64_t rotate_at_seq_num;
 	/*
-	 * This is the id of the chunk where we are writing to if no rotation is
-	 * pending (rotate_at_seq_num == -1ULL). If a rotation is pending, this
-	 * is the chunk_id we will have after the rotation. It must be updated
-	 * atomically with rotate_at_seq_num.
-	 *
-	 * Always access with stream lock held.
+	 * When rotate_at_seq_num != -1ULL, meaning that a rotation is ongoing,
+	 * data_rotated and index_rotated respectively indicate if the stream's
+	 * data and index have been rotated. A rotation is considered completed
+	 * when both rotations have occurred.
+	 */
+	bool data_rotated;
+	bool index_rotated;
+	/*
+	 * `trace_chunk` is the trace chunk to which the file currently
+	 * being produced (if any) belongs.
 	 */
-	uint64_t chunk_id;
+	struct lttng_trace_chunk *trace_chunk;
 };
 
 struct relay_stream *stream_create(struct ctf_trace *trace,