X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fconsumer.h;h=ec4ef3f3162533be8b0f98880eac41dde943e013;hb=e09272cd700e3a0a59100cdf6c3ad2332341109c;hp=1337f32ac0e09e29d39cd5612cfc26e0d0d668c1;hpb=2f77fc4b3720dc8f75847130498c2d4aad7c03ec;p=lttng-tools.git diff --git a/src/bin/lttng-sessiond/consumer.h b/src/bin/lttng-sessiond/consumer.h index 1337f32ac..ec4ef3f31 100644 --- 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 - #include #include #include @@ -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; @@ -180,6 +195,7 @@ void consumer_init_channel_comm_msg(struct lttcomm_consumer_msg *msg, int channel_key, uint64_t max_sb_size, uint64_t mmap_len, - const char *name); + const char *name, + unsigned int nb_init_streams); #endif /* _CONSUMER_H */