Fix RCU-related hangs: incorrect lttng_ht_destroy use

[lttng-tools.git] / src / bin / lttng-sessiond / consumer.h

diff --git a/src/bin/lttng-sessiond/consumer.h b/src/bin/lttng-sessiond/consumer.h
index 11c98773ee363de996ff03d6d158695c4f6e67c7..09f4545a03fdc1e40fb777aaff1c4f9cdf278b2d 100644 (file)
--- a/src/bin/lttng-sessiond/consumer.h
+++ b/src/bin/lttng-sessiond/consumer.h
@@ -22,8 +22,6 @@
 #include <common/hashtable/hashtable.h>
 #include <lttng/lttng.h>
 
-#include "health.h"
-
 enum consumer_dst_type {
        CONSUMER_DST_LOCAL,
        CONSUMER_DST_NET,
@@ -45,6 +43,10 @@ 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;
 };
 
@@ -76,7 +78,9 @@ struct consumer_data {
        pid_t pid;
 
        int err_sock;
+       /* These two sockets uses the cmd_unix_sock_path. */
        int cmd_sock;
+       struct consumer_socket metadata_sock;
 
        /* consumer error and command Unix socket path */
        char err_unix_sock_path[PATH_MAX];
@@ -107,10 +111,6 @@ struct consumer_net {
 
        /* Data path for network streaming. */
        struct lttng_uri data;
-
-       /* Flag if network sockets were sent to the consumer. */
-       unsigned int control_sock_sent;
-       unsigned int data_sock_sent;
 };
 
 /*
@@ -126,7 +126,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.
@@ -148,6 +148,8 @@ struct consumer_output {
 
 struct consumer_socket *consumer_find_socket(int key,
                struct consumer_output *consumer);
+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);
@@ -161,45 +163,74 @@ 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(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_sock *sock, struct consumer_output *consumer,
-               enum lttng_stream_type type, unsigned int session_id);
+               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,
-               unsigned int session_id);
+               uint64_t relayd_id,
+               uint64_t key,
+               unsigned char *uuid,
+               uint32_t chan_id,
+               uint64_t tracefile_size,
+               uint64_t tracefile_count);
+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);
-int consumer_is_data_pending(unsigned int id,
+               unsigned int nb_init_streams,
+               enum lttng_event_output output,
+               int type,
+               uint64_t tracefile_size,
+               uint64_t tracefile_count);
+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);
 
 #endif /* _CONSUMER_H */