X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fconsumer.h;h=3a0c6c8d8f5e3a737e9ce6da64c3fb4e09c4dd21;hb=3eb914c096ff6a91a7d0c4b8bbadb4c85f16aed3;hp=eeaf1100243e1f232a1acb47e0aacdeb4487293c;hpb=30319bcbeabf573068172289850aea0bcfe23abc;p=lttng-tools.git diff --git a/src/common/consumer.h b/src/common/consumer.h index eeaf11002..3a0c6c8d8 100644 --- a/src/common/consumer.h +++ b/src/common/consumer.h @@ -168,6 +168,16 @@ struct lttng_consumer_channel { * monitor list of the channel. */ unsigned int monitor; + + /* + * Channel lock. + * + * This is nested INSIDE the consumer data lock. + * This is nested OUTSIDE the metadata cache lock. + * This is nested OUTSIDE stream lock. + * This is nested OUTSIDE consumer_relayd_sock_pair lock. + */ + pthread_mutex_t lock; }; /* @@ -247,6 +257,7 @@ struct lttng_consumer_stream { * * This is nested INSIDE the consumer_data lock. * This is nested INSIDE the metadata cache lock. + * This is nested INSIDE the channel lock. * This is nested OUTSIDE consumer_relayd_sock_pair lock. */ pthread_mutex_t lock; @@ -573,5 +584,7 @@ int consumer_send_status_channel(int sock, void notify_thread_del_channel(struct lttng_consumer_local_data *ctx, uint64_t key); void consumer_destroy_relayd(struct consumer_relayd_sock_pair *relayd); +unsigned long consumer_get_consumed_maxsize(unsigned long consumed_pos, + unsigned long produced_pos, uint64_t max_stream_size); #endif /* LIB_CONSUMER_H */