X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fconsumer%2Fconsumer.h;h=b940036f6f074ed60cbfeac3daa6f29c1a85095e;hb=39d9954c97102b96fb444e52503c6bab02a9ee3f;hp=d4e9f066a4b8d15bebe4a2270829eb3a53c91907;hpb=92816cc33a1add3c8276839bd6335e17423577dd;p=lttng-tools.git

diff --git a/src/common/consumer/consumer.h b/src/common/consumer/consumer.h
index d4e9f066a..b940036f6 100644
--- a/src/common/consumer/consumer.h
+++ b/src/common/consumer/consumer.h
@@ -233,13 +233,6 @@ struct lttng_consumer_channel {
 
 	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
@@ -841,14 +834,15 @@ 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_rotate_channel(struct lttng_consumer_channel *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_ready_streams(struct lttng_consumer_channel *channel,
+		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_check_rotation_pending_local(uint64_t session_id,