X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fconsumer%2Fconsumer.h;h=9e77ff999601f1ed3efddd67e5dcf378eb5c2760;hb=d73bf3d793ee0b0c5b56cb47cb50c27d1789d3bd;hp=8a780e7f835eb49abd721c027e4c6f1dc6df9a54;hpb=15055ce5780557ef1053fcb4bd91a0746ffa30a0;p=lttng-tools.git

diff --git a/src/common/consumer/consumer.h b/src/common/consumer/consumer.h
index 8a780e7f8..9e77ff999 100644
--- a/src/common/consumer/consumer.h
+++ b/src/common/consumer/consumer.h
@@ -62,6 +62,7 @@ enum lttng_consumer_command {
 	LTTNG_CONSUMER_LOST_PACKETS,
 	LTTNG_CONSUMER_CLEAR_QUIESCENT_CHANNEL,
 	LTTNG_CONSUMER_SET_CHANNEL_MONITOR_PIPE,
+	LTTNG_CONSUMER_SET_CHANNEL_ROTATE_PIPE,
 	LTTNG_CONSUMER_ROTATE_RENAME,
 	LTTNG_CONSUMER_MKDIR,
 };
@@ -228,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;
 };
 
 /*
@@ -565,6 +580,11 @@ struct lttng_consumer_local_data {
 	 * to the session daemon (write-only).
 	 */
 	int channel_monitor_pipe;
+	/*
+	 * Pipe used to inform the session daemon that a stream has finished
+	 * its rotation (write-only).
+	 */
+	int channel_rotate_pipe;
 };
 
 /*
@@ -783,8 +803,11 @@ 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_rotate_stream(struct lttng_consumer_local_data *ctx,
+		struct lttng_consumer_stream *stream);
 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);