X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fconsumer.h;h=eaa115333584d88e6edcfa3785b46ec3addf78d3;hp=ec4ef3f3162533be8b0f98880eac41dde943e013;hb=52898cb1ecfe2cf37bda9b95039826da517b9a5b;hpb=c30aaa51f34105a7f20b9ceb39866001843db6e6 diff --git a/src/bin/lttng-sessiond/consumer.h b/src/bin/lttng-sessiond/consumer.h index ec4ef3f31..eaa115333 100644 --- a/src/bin/lttng-sessiond/consumer.h +++ b/src/bin/lttng-sessiond/consumer.h @@ -22,7 +22,10 @@ #include #include -#include "health.h" +#include "snapshot.h" + +struct snapshot; +struct snapshot_output; enum consumer_dst_type { CONSUMER_DST_LOCAL, @@ -30,8 +33,12 @@ enum consumer_dst_type { }; struct consumer_socket { - /* File descriptor */ - int fd; + /* + * File descriptor. This is just a reference to the consumer data meaning + * that every access must be locked and check for a possible invalid value. + */ + int *fd; + /* * To use this socket (send/recv), this lock MUST be acquired. */ @@ -45,7 +52,13 @@ struct consumer_socket { */ unsigned int registered; + /* Flag if network sockets were sent to the consumer. */ + unsigned int control_sock_sent; + unsigned int data_sock_sent; + struct lttng_ht_node_ulong node; + + enum lttng_consumer_type type; }; struct consumer_data { @@ -76,15 +89,21 @@ struct consumer_data { pid_t pid; int err_sock; + /* These two sockets uses the cmd_unix_sock_path. */ int cmd_sock; + /* + * The metadata socket object is handled differently and only created + * locally in this object thus it's the only reference available in the + * session daemon. For that reason, a static variable for the fd is + * required and the metadata socket fd points to it. + */ + int metadata_fd; + struct consumer_socket metadata_sock; /* consumer error and command Unix socket path */ char err_unix_sock_path[PATH_MAX]; char cmd_unix_sock_path[PATH_MAX]; - /* Health check of the thread */ - struct health_state health; - /* communication lock */ pthread_mutex_t lock; }; @@ -110,9 +129,6 @@ struct consumer_net { /* Data path for network streaming. */ struct lttng_uri data; - - /* Flag if network sockets were sent to the consumer. */ - unsigned int relayd_socks_sent; }; /* @@ -128,7 +144,7 @@ struct consumer_output { * side. It tells the consumer which streams goes to which relayd with this * index. The relayd sockets are index with it on the consumer side. */ - int net_seq_index; + uint64_t net_seq_index; /* * Subdirectory path name used for both local and network consumer. @@ -150,52 +166,105 @@ struct consumer_output { struct consumer_socket *consumer_find_socket(int key, struct consumer_output *consumer); -struct consumer_socket *consumer_allocate_socket(int fd); +struct consumer_socket *consumer_find_socket_by_bitness(int bits, + struct consumer_output *consumer); +struct consumer_socket *consumer_allocate_socket(int *fd); void consumer_add_socket(struct consumer_socket *sock, struct consumer_output *consumer); void consumer_del_socket(struct consumer_socket *sock, struct consumer_output *consumer); void consumer_destroy_socket(struct consumer_socket *sock); +int consumer_copy_sockets(struct consumer_output *dst, + struct consumer_output *src); +void consumer_destroy_output_sockets(struct consumer_output *obj); +int consumer_socket_send(struct consumer_socket *socket, void *msg, + size_t len); +int consumer_socket_recv(struct consumer_socket *socket, void *msg, + size_t len); struct consumer_output *consumer_create_output(enum consumer_dst_type type); struct consumer_output *consumer_copy_output(struct consumer_output *obj); void consumer_destroy_output(struct consumer_output *obj); int consumer_set_network_uri(struct consumer_output *obj, struct lttng_uri *uri); -int consumer_send_fds(int sock, int *fds, size_t nb_fd); -int consumer_send_stream(int sock, struct consumer_output *dst, - struct lttcomm_consumer_msg *msg, int *fds, size_t nb_fd); -int consumer_send_channel(int sock, struct lttcomm_consumer_msg *msg); -int consumer_send_relayd_socket(int consumer_sock, - struct lttcomm_sock *sock, struct consumer_output *consumer, - enum lttng_stream_type type); +int consumer_send_fds(struct consumer_socket *sock, int *fds, size_t nb_fd); +int consumer_send_msg(struct consumer_socket *sock, + struct lttcomm_consumer_msg *msg); +int consumer_send_stream(struct consumer_socket *sock, + struct consumer_output *dst, struct lttcomm_consumer_msg *msg, + int *fds, size_t nb_fd); +int consumer_send_channel(struct consumer_socket *sock, + struct lttcomm_consumer_msg *msg); +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); int consumer_send_destroy_relayd(struct consumer_socket *sock, struct consumer_output *consumer); +int consumer_recv_status_reply(struct consumer_socket *sock); +int consumer_recv_status_channel(struct consumer_socket *sock, + uint64_t *key, unsigned int *stream_count); 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_stream_comm_msg(struct lttcomm_consumer_msg *msg, - enum lttng_consumer_command cmd, - int channel_key, - int stream_key, - uint32_t state, - enum lttng_event_output output, - uint64_t mmap_len, +void consumer_init_ask_channel_comm_msg(struct lttcomm_consumer_msg *msg, + uint64_t subbuf_size, + uint64_t num_subbuf, + int overwrite, + unsigned int switch_timer_interval, + unsigned int read_timer_interval, + int output, + int type, + uint64_t session_id, + const char *pathname, + const char *name, uid_t uid, gid_t gid, - int net_index, - unsigned int metadata_flag, - const char *name, - const char *pathname); + uint64_t relayd_id, + uint64_t key, + unsigned char *uuid, + uint32_t chan_id, + uint64_t tracefile_size, + uint64_t tracefile_count, + uint64_t session_id_per_pid, + unsigned int monitor, + uint32_t ust_app_uid); +void consumer_init_stream_comm_msg(struct lttcomm_consumer_msg *msg, + enum lttng_consumer_command cmd, + uint64_t channel_key, + uint64_t stream_key, + int cpu); void consumer_init_channel_comm_msg(struct lttcomm_consumer_msg *msg, enum lttng_consumer_command cmd, - int channel_key, - uint64_t max_sb_size, - uint64_t mmap_len, + uint64_t channel_key, + uint64_t session_id, + const char *pathname, + uid_t uid, + gid_t gid, + uint64_t relayd_id, const char *name, - unsigned int nb_init_streams); + unsigned int nb_init_streams, + enum lttng_event_output output, + int type, + uint64_t tracefile_size, + uint64_t tracefile_count, + unsigned int monitor); +int consumer_is_data_pending(uint64_t session_id, + struct consumer_output *consumer); +int consumer_close_metadata(struct consumer_socket *socket, + uint64_t metadata_key); +int consumer_setup_metadata(struct consumer_socket *socket, + uint64_t metadata_key); +int consumer_push_metadata(struct consumer_socket *socket, + uint64_t metadata_key, char *metadata_str, size_t len, + size_t target_offset); +int consumer_flush_channel(struct consumer_socket *socket, uint64_t key); + +/* 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, int max_size_per_stream); #endif /* _CONSUMER_H */