X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2Fstream.h;h=a4a6461e69cf218cfa2d573437ada85b12bb3a7d;hb=348a81dcf7b6944b10a813d93dcaf86fdb5194f6;hp=151ae25c1ad2be5f3243bc22094c186556a61b29;hpb=7a45c7e6401baebe3715b317a3d871ee49921057;p=lttng-tools.git

diff --git a/src/bin/lttng-relayd/stream.h b/src/bin/lttng-relayd/stream.h
index 151ae25c1..a4a6461e6 100644
--- a/src/bin/lttng-relayd/stream.h
+++ b/src/bin/lttng-relayd/stream.h
@@ -26,16 +26,12 @@
 #include <urcu/list.h>
 
 #include <common/hashtable/hashtable.h>
+#include <common/trace-chunk.h>
 
 #include "session.h"
 #include "stream-fd.h"
 #include "tracefile-array.h"
 
-struct relay_stream_chunk_id {
-	bool is_set;
-	uint64_t value;
-};
-
 /*
  * Represents a stream in the relay
  */
@@ -52,10 +48,12 @@ struct relay_stream {
 	 * inside the ctf_trace lock.
 	 */
 	pthread_mutex_t lock;
-	uint64_t prev_seq;		/* previous data sequence number encountered. */
+	/* previous data sequence number written to disk. */
+	uint64_t prev_data_seq;
 	/* previous index sequence number written to disk. */
 	uint64_t prev_index_seq;
-	uint64_t last_net_seq_num;	/* seq num to encounter before closing. */
+	/* 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;
@@ -63,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. */
@@ -151,23 +163,24 @@ 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.
-	 *
-	 * This attribute is not set if the stream is created by a pre-2.11
-	 * consumer.
+	 * 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.
 	 */
-	struct relay_stream_chunk_id current_chunk_id;
+	struct lttng_trace_chunk *trace_chunk;
 };
 
 struct relay_stream *stream_create(struct ctf_trace *trace,
 	uint64_t stream_handle, char *path_name,
 	char *channel_name, uint64_t tracefile_size,
-	uint64_t tracefile_count, const struct relay_stream_chunk_id *chunk_id);
+	uint64_t tracefile_count);
 
 struct relay_stream *stream_get_by_id(uint64_t stream_id);
 bool stream_get(struct relay_stream *stream);