Fix: multiple consumer locking problems

[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 2eb9d7433455f8156d83678029628ab7a969c41c..c85529cfde94cf36fb714ac4b67137f72385e69f 100644 (file)
--- a/src/bin/lttng-sessiond/consumer.h
+++ b/src/bin/lttng-sessiond/consumer.h
@@ -21,13 +21,26 @@
 #include <semaphore.h>
 
 #include <common/consumer.h>
+#include <common/hashtable/hashtable.h>
 #include <lttng/lttng.h>
 
+#include "health.h"
+
 enum consumer_dst_type {
        CONSUMER_DST_LOCAL,
        CONSUMER_DST_NET,
 };
 
+struct consumer_socket {
+       /* File descriptor */
+       int fd;
+       /*
+        * To use this socket (send/recv), this lock MUST be acquired.
+        */
+       pthread_mutex_t *lock;
+       struct lttng_ht_node_ulong node;
+};
+
 struct consumer_data {
        enum lttng_consumer_type type;
 
@@ -44,6 +57,12 @@ struct consumer_data {
        /* 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;
 };
 
 /*
@@ -67,33 +86,53 @@ 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;
 };
 
 /*
  * Consumer output object describing where and how to send data.
  */
 struct consumer_output {
-       /* Consumer socket file descriptor */
-       int sock;
        /* If the consumer is enabled meaning that should be used */
        unsigned int enabled;
        enum consumer_dst_type type;
+
        /*
         * The net_seq_index is the index of the network stream on the consumer
-        * side. It's basically the relayd socket file descriptor value so the
-        * consumer can identify which streams goes with which socket.
+        * 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;
+
        /*
         * Subdirectory path name used for both local and network consumer.
         */
        char subdir[PATH_MAX];
+
+       /*
+        * 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).
+        */
+       struct lttng_ht *socks;
+
        union {
                char trace_path[PATH_MAX];
                struct consumer_net net;
        } dst;
 };
 
+struct consumer_socket *consumer_find_socket(int key,
+               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);
+
 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);
@@ -103,6 +142,14 @@ 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_destroy_relayd(struct consumer_socket *sock,
+               struct consumer_output *consumer);
+int consumer_create_socket(struct consumer_data *data,
+               struct consumer_output *output);
+
 void consumer_init_stream_comm_msg(struct lttcomm_consumer_msg *msg,
                enum lttng_consumer_command cmd,
                int channel_key,