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 cde2d0d060be09375c0dabcdfda5c4e1b15afccc..09f4545a03fdc1e40fb777aaff1c4f9cdf278b2d 100644 (file)
--- a/src/bin/lttng-sessiond/consumer.h
+++ b/src/bin/lttng-sessiond/consumer.h
@@ -78,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];
@@ -169,7 +171,7 @@ int consumer_send_stream(struct consumer_socket *sock,
 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,
+               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);
@@ -198,7 +200,9 @@ void consumer_init_ask_channel_comm_msg(struct lttcomm_consumer_msg *msg,
                uint64_t relayd_id,
                uint64_t key,
                unsigned char *uuid,
-               uint32_t chan_id);
+               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,
@@ -215,7 +219,9 @@ void consumer_init_channel_comm_msg(struct lttcomm_consumer_msg *msg,
                const char *name,
                unsigned int nb_init_streams,
                enum lttng_event_output output,
-               int type);
+               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,