Add filter sequence number to UST

[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 c85529cfde94cf36fb714ac4b67137f72385e69f..e45d5b0bf4a99b9311968529e31150bfc0188dad 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>
@@ -38,6 +36,15 @@ struct consumer_socket {
         * To use this socket (send/recv), this lock MUST be acquired.
         */
        pthread_mutex_t *lock;
+
+       /*
+        * Indicates if the socket was registered by a third part
+        * (REGISTER_CONSUMER) or is the spawn consumer of the session daemon.
+        * During the destroy phase of a consumer output, we close the socket if
+        * this flag is set to 1 since we don't need the fd anymore.
+        */
+       unsigned int registered;
+
        struct lttng_ht_node_ulong node;
 };
 
@@ -45,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;
@@ -88,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,8 +172,11 @@ int consumer_send_relayd_socket(int consumer_sock,
                enum lttng_stream_type type);
 int consumer_send_destroy_relayd(struct consumer_socket *sock,
                struct consumer_output *consumer);
+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,
@@ -162,12 +190,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 */