X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fcommon%2Fconsumer%2Fconsumer.h;h=181c8d8ec2b4e3f5450e5138801740b33a32c813;hb=02d02e31d47c091a38154c9c188c08387902d97b;hp=1187942577366f8f061ea1795b67b5e5e6e3ce0c;hpb=62c43103c60bd704cd8ed7acaaa22465802f5673;p=lttng-tools.git

diff --git a/src/common/consumer/consumer.h b/src/common/consumer/consumer.h
index 118794257..181c8d8ec 100644
--- a/src/common/consumer/consumer.h
+++ b/src/common/consumer/consumer.h
@@ -229,6 +229,20 @@ struct lttng_consumer_channel {
 	uint64_t lost_packets;
 
 	bool streams_sent_to_relayd;
+
+	/*
+	 * Account how many streams are waiting for their rotation to be
+	 * complete. When this number reaches 0, we inform the session
+	 * daemon that this channel has finished its rotation.
+	 */
+	uint64_t nr_stream_rotate_pending;
+
+	/*
+	 * The chunk id where we currently write the data. This value is sent
+	 * to the relay when we add a stream and when a stream rotates. This
+	 * allows to keep track of where each stream on the relay is writing.
+	 */
+	uint64_t current_chunk_id;
 };
 
 /*
@@ -416,6 +430,14 @@ struct lttng_consumer_stream {
 	pthread_cond_t metadata_rdv;
 	pthread_mutex_t metadata_rdv_lock;
 
+	/*
+	 * rotate_position represents the position in the ring-buffer that has to
+	 * be flushed to disk to complete the ongoing rotation. When that position
+	 * is reached, this tracefile can be closed and a new one is created in
+	 * channel_read_only_attributes.path.
+	 */
+	unsigned long rotate_position;
+
 	/*
 	 * Read-only copies of channel values. We cannot safely access the
 	 * channel from a stream, so we need to have a local copy of these
@@ -427,6 +449,12 @@ struct lttng_consumer_stream {
 		uint64_t tracefile_size;
 	} channel_read_only_attributes;
 
+	/*
+	 * Flag to inform the data or metadata thread that a stream is
+	 * ready to be rotated.
+	 */
+	bool rotate_ready;
+
 	/* Indicate if the stream still has some data to be read. */
 	unsigned int has_data:1;
 	/*
@@ -789,8 +817,12 @@ void consumer_del_stream_for_data(struct lttng_consumer_stream *stream);
 void consumer_add_metadata_stream(struct lttng_consumer_stream *stream);
 void consumer_del_stream_for_metadata(struct lttng_consumer_stream *stream);
 int consumer_create_index_file(struct lttng_consumer_stream *stream);
+int lttng_consumer_stream_is_rotate_ready(struct lttng_consumer_stream *stream);
+int lttng_consumer_rotate_stream(struct lttng_consumer_local_data *ctx,
+		struct lttng_consumer_stream *stream, bool *rotated);
 int lttng_consumer_rotate_rename(const char *current_path, const char *new_path,
 		uid_t uid, gid_t gid, uint64_t relayd_id);
+void lttng_consumer_reset_stream_rotate_state(struct lttng_consumer_stream *stream);
 int lttng_consumer_mkdir(const char *path, uid_t uid, gid_t gid,
 		uint64_t relayd_id);