Make the consumer sends a ACK after each command

[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 1337f32ac0e09e29d39cd5612cfc26e0d0d668c1..01548cd17f088bfab82e6bd57082ed2ff87c1510 100644 (file)
--- a/src/bin/lttng-sessiond/consumer.h
+++ b/src/bin/lttng-sessiond/consumer.h
@@ -18,8 +18,6 @@
 #ifndef _CONSUMER_H
 #define _CONSUMER_H
 
-#include <semaphore.h>
-
 #include <common/consumer.h>
 #include <common/hashtable/hashtable.h>
 #include <lttng/lttng.h>
@@ -54,7 +52,24 @@ struct consumer_data {
        enum lttng_consumer_type type;
 
        pthread_t thread;       /* Worker thread interacting with the consumer */
-       sem_t sem;
+
+       /* Conditions used by the consumer thread to indicate readiness. */
+       pthread_cond_t cond;
+       pthread_condattr_t condattr;
+       pthread_mutex_t cond_mutex;
+
+       /*
+        * This is a flag condition indicating that the consumer thread is ready
+        * and connected to the lttng-consumerd daemon. This flag MUST only be
+        * updated by locking the condition mutex above or before spawning a
+        * consumer thread.
+        *
+        * A value of 0 means that the thread is NOT ready. A value of 1 means that
+        * the thread consumer did connect successfully to the lttng-consumerd
+        * daemon. A negative value indicates that there is been an error and the
+        * thread has likely quit.
+        */
+       int consumer_thread_is_ready;
 
        /* Mutex to control consumerd pid assignation */
        pthread_mutex_t pid_mutex;
@@ -97,7 +112,8 @@ struct consumer_net {
        struct lttng_uri data;
 
        /* Flag if network sockets were sent to the consumer. */
-       unsigned int relayd_socks_sent;
+       unsigned int control_sock_sent;
+       unsigned int data_sock_sent;
 };
 
 /*
@@ -147,15 +163,18 @@ 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,
+int consumer_send_fds(struct consumer_socket *sock, int *fds, size_t nb_fd);
+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);
 int consumer_send_destroy_relayd(struct consumer_socket *sock,
                struct consumer_output *consumer);
+int consumer_recv_status_reply(struct consumer_socket *sock);
 void consumer_output_send_destroy_relayd(struct consumer_output *consumer);
 int consumer_create_socket(struct consumer_data *data,
                struct consumer_output *output);
@@ -174,12 +193,16 @@ void consumer_init_stream_comm_msg(struct lttcomm_consumer_msg *msg,
                int net_index,
                unsigned int metadata_flag,
                const char *name,
-               const char *pathname);
+               const char *pathname,
+               unsigned int session_id);
 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,
-               const char *name);
+               const char *name,
+               unsigned int nb_init_streams);
+int consumer_is_data_pending(unsigned int id,
+               struct consumer_output *consumer);
 
 #endif /* _CONSUMER_H */