X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fconsumer.h;h=1844a1c695fce4e89808655309891c39dcbb817e;hp=cdc48b7f3131df6600af05bf3c31cd70a5046266;hb=51a4828f21385847870ec2b2499e2f3e3842c26e;hpb=e098433c90550d74288498f8c4474ef4c2daea68 diff --git a/src/bin/lttng-sessiond/consumer.h b/src/bin/lttng-sessiond/consumer.h index cdc48b7f3..1844a1c69 100644 --- a/src/bin/lttng-sessiond/consumer.h +++ b/src/bin/lttng-sessiond/consumer.h @@ -27,12 +27,19 @@ struct snapshot; struct snapshot_output; +struct ltt_session; enum consumer_dst_type { CONSUMER_DST_LOCAL, CONSUMER_DST_NET, }; +enum consumer_trace_chunk_exists_status { + CONSUMER_TRACE_CHUNK_EXISTS_STATUS_EXISTS_LOCAL, + CONSUMER_TRACE_CHUNK_EXISTS_STATUS_EXISTS_REMOTE, + CONSUMER_TRACE_CHUNK_EXISTS_STATUS_UNKNOWN_CHUNK, +}; + struct consumer_socket { /* * File descriptor. This is just a reference to the consumer data meaning @@ -66,26 +73,6 @@ struct consumer_socket { struct consumer_data { enum lttng_consumer_type type; - pthread_t thread; /* Worker thread interacting with the consumer */ - - /* Conditions used by the consumer thread to indicate readiness. */ - pthread_cond_t cond; - pthread_condattr_t condattr; - pthread_mutex_t cond_mutex; - - /* - * This is a flag condition indicating that the consumer thread is ready - * and connected to the lttng-consumerd daemon. This flag MUST only be - * updated by locking the condition mutex above or before spawning a - * consumer thread. - * - * A value of 0 means that the thread is NOT ready. A value of 1 means that - * the thread consumer did connect successfully to the lttng-consumerd - * daemon. A negative value indicates that there is been an error and the - * thread has likely quit. - */ - int consumer_thread_is_ready; - /* Mutex to control consumerd pid assignation */ pthread_mutex_t pid_mutex; pid_t pid; @@ -98,11 +85,6 @@ struct consumer_data { * consumer. */ int channel_monitor_pipe; - /* - * Write-end of the channel rotation pipe to be passed to the - * consumer. - */ - int channel_rotate_pipe; /* * The metadata socket object is handled differently and only created * locally in this object thus it's the only reference available in the @@ -170,16 +152,20 @@ struct consumer_output { uint32_t relay_major_version; uint32_t relay_minor_version; + /* True if relayd supports the clear feature. */ + bool relay_allows_clear; + /* * Subdirectory path name used for both local and network - * consumer (/kernel or /ust). + * consumer ("kernel", "ust", or empty). */ - char subdir[LTTNG_PATH_MAX]; + char domain_subdir[max(sizeof(DEFAULT_KERNEL_TRACE_DIR), + sizeof(DEFAULT_UST_TRACE_DIR))]; /* * Hashtable of consumer_socket index by the file descriptor value. For - * multiarch consumer support, we can have more than one consumer (ex: 32 - * and 64 bit). + * multiarch consumer support, we can have more than one consumer (ex: + * 32 and 64 bit). */ struct lttng_ht *socks; @@ -199,9 +185,9 @@ struct consumer_output { }; struct consumer_socket *consumer_find_socket(int key, - struct consumer_output *consumer); + const struct consumer_output *consumer); struct consumer_socket *consumer_find_socket_by_bitness(int bits, - struct consumer_output *consumer); + const struct consumer_output *consumer); struct consumer_socket *consumer_allocate_socket(int *fd); void consumer_add_socket(struct consumer_socket *sock, struct consumer_output *consumer); @@ -220,7 +206,8 @@ struct consumer_output *consumer_create_output(enum consumer_dst_type type); struct consumer_output *consumer_copy_output(struct consumer_output *obj); void consumer_output_get(struct consumer_output *obj); void consumer_output_put(struct consumer_output *obj); -int consumer_set_network_uri(struct consumer_output *obj, +int consumer_set_network_uri(const struct ltt_session *session, + struct consumer_output *obj, struct lttng_uri *uri); int consumer_send_fds(struct consumer_socket *sock, const int *fds, size_t nb_fd); @@ -234,11 +221,12 @@ int consumer_send_channel(struct consumer_socket *sock, int consumer_send_relayd_socket(struct consumer_socket *consumer_sock, struct lttcomm_relayd_sock *rsock, struct consumer_output *consumer, enum lttng_stream_type type, uint64_t session_id, - char *session_name, char *hostname, int session_live_timer); + const char *session_name, const char *hostname, + const char *base_path, int session_live_timer, + const uint64_t *current_chunk_id, time_t session_creation_time, + bool session_name_contains_creation_time); int consumer_send_channel_monitor_pipe(struct consumer_socket *consumer_sock, int pipe); -int consumer_send_channel_rotate_pipe(struct consumer_socket *consumer_sock, - int pipe); int consumer_send_destroy_relayd(struct consumer_socket *sock, struct consumer_output *consumer); int consumer_recv_status_reply(struct consumer_socket *sock); @@ -247,8 +235,6 @@ int consumer_recv_status_channel(struct consumer_socket *sock, void consumer_output_send_destroy_relayd(struct consumer_output *consumer); int consumer_create_socket(struct consumer_data *data, struct consumer_output *output); -int consumer_set_subdir(struct consumer_output *consumer, - const char *session_name); void consumer_init_ask_channel_comm_msg(struct lttcomm_consumer_msg *msg, uint64_t subbuf_size, @@ -263,8 +249,6 @@ void consumer_init_ask_channel_comm_msg(struct lttcomm_consumer_msg *msg, uint64_t session_id, const char *pathname, const char *name, - uid_t uid, - gid_t gid, uint64_t relayd_id, uint64_t key, unsigned char *uuid, @@ -277,12 +261,12 @@ void consumer_init_ask_channel_comm_msg(struct lttcomm_consumer_msg *msg, int64_t blocking_timeout, const char *root_shm_path, const char *shm_path, - uint64_t trace_archive_id); + struct lttng_trace_chunk *trace_chunk, + const struct lttng_credentials *buffer_credentials); void consumer_init_add_stream_comm_msg(struct lttcomm_consumer_msg *msg, uint64_t channel_key, uint64_t stream_key, - int32_t cpu, - uint64_t trace_archive_id); + int32_t cpu); void consumer_init_streams_sent_comm_msg(struct lttcomm_consumer_msg *msg, enum lttng_consumer_command cmd, uint64_t channel_key, uint64_t net_seq_idx); @@ -301,7 +285,8 @@ void consumer_init_add_channel_comm_msg(struct lttcomm_consumer_msg *msg, uint64_t tracefile_count, unsigned int monitor, unsigned int live_timer_interval, - unsigned int monitor_timer_interval); + unsigned int monitor_timer_interval, + struct lttng_trace_chunk *trace_chunk); int consumer_is_data_pending(uint64_t session_id, struct consumer_output *consumer); int consumer_close_metadata(struct consumer_socket *socket, @@ -319,23 +304,35 @@ int consumer_get_lost_packets(uint64_t session_id, uint64_t channel_key, struct consumer_output *consumer, uint64_t *lost); /* Snapshot command. */ -int consumer_snapshot_channel(struct consumer_socket *socket, uint64_t key, - struct snapshot_output *output, int metadata, - uid_t uid, gid_t gid, const char *session_path, int wait, - uint64_t nb_packets_per_stream, uint64_t trace_archive_id); +enum lttng_error_code consumer_snapshot_channel(struct consumer_socket *socket, + uint64_t key, const struct consumer_output *output, int metadata, + uid_t uid, gid_t gid, const char *channel_path, int wait, + uint64_t nb_packets_per_stream); +/* Rotation commands. */ int consumer_rotate_channel(struct consumer_socket *socket, uint64_t key, uid_t uid, gid_t gid, struct consumer_output *output, - char *domain_path, bool is_metadata_channel, uint64_t new_chunk_id, - bool *rotate_pending_relay); -int consumer_rotate_rename(struct consumer_socket *socket, uint64_t session_id, - const struct consumer_output *output, const char *old_path, - const char *new_path, uid_t uid, gid_t gid); -int consumer_rotate_pending_relay(struct consumer_socket *socket, - struct consumer_output *output, uint64_t session_id, - uint64_t chunk_id); -int consumer_mkdir(struct consumer_socket *socket, uint64_t session_id, - const struct consumer_output *output, const char *path, - uid_t uid, gid_t gid); + bool is_metadata_channel); +int consumer_init(struct consumer_socket *socket, + const lttng_uuid sessiond_uuid); + +int consumer_create_trace_chunk(struct consumer_socket *socket, + uint64_t relayd_id, uint64_t session_id, + struct lttng_trace_chunk *chunk, + const char *domain_subdir); +int consumer_close_trace_chunk(struct consumer_socket *socket, + uint64_t relayd_id, uint64_t session_id, + struct lttng_trace_chunk *chunk, + char *closed_trace_chunk_path); +int consumer_trace_chunk_exists(struct consumer_socket *socket, + uint64_t relayd_id, uint64_t session_id, + struct lttng_trace_chunk *chunk, + enum consumer_trace_chunk_exists_status *result); + +char *setup_channel_trace_path(struct consumer_output *consumer, + const char *session_path, size_t *consumer_path_offset); + +/* Clear command */ +int consumer_clear_channel(struct consumer_socket *socket, uint64_t key); #endif /* _CONSUMER_H */