#include <common/sessiond-comm/sessiond-comm.h>
#include <common/pipe.h>
#include <common/index/ctf-index.h>
+#include <common/trace-chunk-registry.h>
/* Commands for consumer */
enum lttng_consumer_command {
LTTNG_CONSUMER_CHECK_ROTATION_PENDING_LOCAL,
LTTNG_CONSUMER_CHECK_ROTATION_PENDING_RELAY,
LTTNG_CONSUMER_MKDIR,
+ LTTNG_CONSUMER_INIT,
};
/* State of each fd in consumer */
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 */
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
* to the session daemon (write-only).
*/
int channel_monitor_pipe;
+ LTTNG_OPTIONAL(lttng_uuid) sessiond_uuid;
};
/*
/* 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.
* This HT uses the "node_channel_id" of the consumer stream.
*/
struct lttng_ht *stream_per_chan_id_ht;
+
+ /*
+ * Trace chunk registry indexed by (session_id, chunk_id).
+ */
+ struct lttng_trace_chunk_registry *chunk_registry;
};
/*
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,
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);
+enum lttcomm_return_code lttng_consumer_init_command(
+ struct lttng_consumer_local_data *ctx,
+ const lttng_uuid sessiond_uuid);
#endif /* LIB_CONSUMER_H */