X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fconsumer.h;h=5a11950084bce1f36625ff0ce7809c31ca5eae71;hp=eeaf1100243e1f232a1acb47e0aacdeb4487293c;hb=75d83e506938a3e673ad19bb11838ee88e977e72;hpb=30319bcbeabf573068172289850aea0bcfe23abc

diff --git a/src/common/consumer.h b/src/common/consumer.h
index eeaf11002..5a1195008 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;
@@ -279,6 +290,16 @@ struct lttng_consumer_stream {
 	 * acquired in the destroy path.
 	 */
 	unsigned int globally_visible;
+	/*
+	 * Pipe to wake up the metadata poll thread when the UST metadata
+	 * cache is updated.
+	 */
+	int ust_metadata_poll_pipe[2];
+	/*
+	 * How much metadata was read from the metadata cache and sent
+	 * to the channel.
+	 */
+	uint64_t ust_metadata_pushed;
 };
 
 /*
@@ -375,8 +396,10 @@ struct lttng_consumer_local_data {
 	enum lttng_consumer_type type;
 	/* socket to communicate errors with sessiond */
 	int consumer_error_socket;
-	/* socket to ask metadata to sessiond */
+	/* socket to ask metadata to sessiond. */
 	int consumer_metadata_socket;
+	/* Protect consumer_metadata_socket. */
+	pthread_mutex_t metadata_socket_lock;
 	/* socket to exchange commands with sessiond */
 	char *consumer_command_sock_path;
 	/* communication with splice */
@@ -573,5 +596,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 */