X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fconsumer.h;h=75a40f8ae61c6a6837703902e13ad0ae8278272f;hp=7ff3e5dcf70cbe06f28c371480ffd4391eec75a1;hb=93ec662e687dc15a3601704a1e0c96c51ad228c9;hpb=4ce514c43483ba24fd935024da5b7aca681a7e52 diff --git a/src/bin/lttng-sessiond/consumer.h b/src/bin/lttng-sessiond/consumer.h index 7ff3e5dcf..75a40f8ae 100644 --- a/src/bin/lttng-sessiond/consumer.h +++ b/src/bin/lttng-sessiond/consumer.h @@ -18,9 +18,10 @@ #ifndef _CONSUMER_H #define _CONSUMER_H -#include +#include #include #include +#include #include "snapshot.h" @@ -35,9 +36,10 @@ enum consumer_dst_type { struct consumer_socket { /* * 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. + * that every access must be locked and checked for a possible invalid + * value. */ - int *fd; + int *fd_ptr; /* * To use this socket (send/recv), this lock MUST be acquired. @@ -94,8 +96,8 @@ struct consumer_data { /* * 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. + * session daemon. For that reason, a variable for the fd is required and + * the metadata socket fd points to it. */ int metadata_fd; struct consumer_socket metadata_sock; @@ -104,7 +106,11 @@ struct consumer_data { char err_unix_sock_path[PATH_MAX]; char cmd_unix_sock_path[PATH_MAX]; - /* communication lock */ + /* + * This lock has two purposes. It protects any change to the consumer + * socket and make sure only one thread uses this object for read/write + * operations. + */ pthread_mutex_t lock; }; @@ -135,6 +141,8 @@ struct consumer_net { * Consumer output object describing where and how to send data. */ struct consumer_output { + struct urcu_ref ref; /* Refcount */ + /* If the consumer is enabled meaning that should be used */ unsigned int enabled; enum consumer_dst_type type; @@ -145,6 +153,9 @@ struct consumer_output { * index. The relayd sockets are index with it on the consumer side. */ uint64_t net_seq_index; + /* Store the relay protocol in use if the session is remote. */ + uint32_t relay_major_version; + uint32_t relay_minor_version; /* * Subdirectory path name used for both local and network consumer. @@ -158,6 +169,9 @@ struct consumer_output { */ struct lttng_ht *socks; + /* Tell if this output is used for snapshot. */ + unsigned int snapshot:1; + union { char trace_path[PATH_MAX]; struct consumer_net net; @@ -177,10 +191,15 @@ 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); +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, struct lttng_uri *uri); int consumer_send_fds(struct consumer_socket *sock, int *fds, size_t nb_fd); @@ -193,7 +212,8 @@ 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); + enum lttng_stream_type type, uint64_t session_id, + char *session_name, char *hostname, int session_live_timer); int consumer_send_destroy_relayd(struct consumer_socket *sock, struct consumer_output *consumer); int consumer_recv_status_reply(struct consumer_socket *sock); @@ -211,6 +231,7 @@ void consumer_init_ask_channel_comm_msg(struct lttcomm_consumer_msg *msg, int overwrite, unsigned int switch_timer_interval, unsigned int read_timer_interval, + unsigned int live_timer_interval, int output, int type, uint64_t session_id, @@ -226,12 +247,17 @@ void consumer_init_ask_channel_comm_msg(struct lttcomm_consumer_msg *msg, uint64_t tracefile_count, uint64_t session_id_per_pid, unsigned int monitor, - uint32_t ust_app_uid); + uint32_t ust_app_uid, + const char *root_shm_path, + const char *shm_path); 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_streams_sent_comm_msg(struct lttcomm_consumer_msg *msg, + enum lttng_consumer_command cmd, + uint64_t channel_key, uint64_t net_seq_idx); void consumer_init_channel_comm_msg(struct lttcomm_consumer_msg *msg, enum lttng_consumer_command cmd, uint64_t channel_key, @@ -246,7 +272,8 @@ void consumer_init_channel_comm_msg(struct lttcomm_consumer_msg *msg, int type, uint64_t tracefile_size, uint64_t tracefile_count, - unsigned int monitor); + unsigned int monitor, + unsigned int live_timer_interval); int consumer_is_data_pending(uint64_t session_id, struct consumer_output *consumer); int consumer_close_metadata(struct consumer_socket *socket, @@ -255,12 +282,16 @@ 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); + size_t target_offset, uint64_t version); int consumer_flush_channel(struct consumer_socket *socket, uint64_t key); +int consumer_get_discarded_events(uint64_t session_id, uint64_t channel_key, + struct consumer_output *consumer, uint64_t *discarded); +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, int max_size_per_stream); + const char *session_path, int wait, uint64_t nb_packets_per_stream); #endif /* _CONSUMER_H */