Add the trace chunk and trace chunk registry interfaces

[lttng-tools.git] / src / common / consumer / consumer.h

diff --git a/src/common/consumer/consumer.h b/src/common/consumer/consumer.h
index d4e9f066a4b8d15bebe4a2270829eb3a53c91907..1c1d01de911fee38edcbb3c9c089b0f5a7b11e8c 100644 (file)
--- a/src/common/consumer/consumer.h
+++ b/src/common/consumer/consumer.h
@@ -112,6 +112,8 @@ struct consumer_metadata_cache;
 struct lttng_consumer_channel {
        /* HT node used for consumer_data.channel_ht */
        struct lttng_ht_node_u64 node;
+       /* HT node used for consumer_data.channels_by_session_id_ht */
+       struct lttng_ht_node_u64 channels_by_session_id_ht_node;
        /* Indexed key. Incremented value in the consumer. */
        uint64_t key;
        /* Number of streams referencing this channel */
@@ -233,13 +235,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
@@ -628,6 +623,8 @@ struct lttng_consumer_global_data {
 
        /* Channel hash table protected by consumer_data.lock. */
        struct lttng_ht *channel_ht;
+       /* Channel hash table indexed by session id. */
+       struct lttng_ht *channels_by_session_id_ht;
        /*
         * Flag specifying if the local array of FDs needs update in the
         * poll function. Protected by consumer_data.lock.
@@ -841,14 +838,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,