X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=src%2Fcommon%2Fconsumer%2Fconsumer.h;h=4cc40a431ee7ba86b0a54913aa73b43bdc3216f4;hb=11413bb9165b46d4756057aff2bc5d2efd26077c;hp=181c8d8ec2b4e3f5450e5138801740b33a32c813;hpb=02d02e31d47c091a38154c9c188c08387902d97b;p=lttng-tools.git

diff --git a/src/common/consumer/consumer.h b/src/common/consumer/consumer.h
index 181c8d8ec..4cc40a431 100644
--- a/src/common/consumer/consumer.h
+++ b/src/common/consumer/consumer.h
@@ -63,7 +63,9 @@ enum lttng_consumer_command {
 	LTTNG_CONSUMER_CLEAR_QUIESCENT_CHANNEL,
 	LTTNG_CONSUMER_SET_CHANNEL_MONITOR_PIPE,
 	LTTNG_CONSUMER_SET_CHANNEL_ROTATE_PIPE,
+	LTTNG_CONSUMER_ROTATE_CHANNEL,
 	LTTNG_CONSUMER_ROTATE_RENAME,
+	LTTNG_CONSUMER_ROTATE_PENDING_RELAY,
 	LTTNG_CONSUMER_MKDIR,
 };
 
@@ -414,6 +416,11 @@ struct lttng_consumer_stream {
 	uint64_t last_discarded_events;
 	/* Copy of the sequence number of the last packet extracted. */
 	uint64_t last_sequence_number;
+	/*
+	 * Session's current trace archive id at the time of the creation of
+	 * this stream.
+	 */
+	uint64_t trace_archive_id;
 	/*
 	 * Index file object of the index file for this stream.
 	 */
@@ -471,7 +478,7 @@ struct consumer_relayd_sock_pair {
 	/* Network sequence number. */
 	uint64_t net_seq_idx;
 	/* Number of stream associated with this relayd */
-	unsigned int refcount;
+	int refcount;
 
 	/*
 	 * This flag indicates whether or not we should destroy this object. The
@@ -505,6 +512,7 @@ struct consumer_relayd_sock_pair {
 	/* Session id on both sides for the sockets. */
 	uint64_t relayd_session_id;
 	uint64_t sessiond_session_id;
+	struct lttng_consumer_local_data *ctx;
 };
 
 /*
@@ -726,7 +734,8 @@ struct lttng_consumer_stream *consumer_allocate_stream(uint64_t channel_key,
 		int cpu,
 		int *alloc_ret,
 		enum consumer_channel_type type,
-		unsigned int monitor);
+		unsigned int monitor,
+		uint64_t trace_archive_id);
 struct lttng_consumer_channel *consumer_allocate_channel(uint64_t key,
 		uint64_t session_id,
 		const char *pathname,
@@ -817,13 +826,21 @@ 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_channel(uint64_t key, const char *path,
+		uint64_t relayd_id, uint32_t metadata,
+		uint64_t new_chunk_id, struct lttng_consumer_local_data *ctx);
 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_ready_streams(uint64_t key,
+		struct lttng_consumer_local_data *ctx);
 int lttng_consumer_rotate_rename(const char *current_path, const char *new_path,
 		uid_t uid, gid_t gid, uint64_t relayd_id);
+int lttng_consumer_rotate_pending_relay( uint64_t session_id,
+		uint64_t relayd_id, uint64_t chunk_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);
+void lttng_consumer_cleanup_relayd(struct consumer_relayd_sock_pair *relayd);
 
 #endif /* LIB_CONSUMER_H */