X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fconsumer.h;h=18f64b6ef4ad5ca7e6bb05e7310a2e324e92b71a;hb=ace17efaf90b672f303b22959146c01793e9d4b2;hp=dd26e51834d5738a653380b0ab8e872902d565ed;hpb=5c786dedd0156b93984f89ba47ec841277ed7dae;p=lttng-tools.git

diff --git a/src/common/consumer.h b/src/common/consumer.h
index dd26e5183..18f64b6ef 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,14 @@ 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.
+	 *
+	 * This is nested OUTSIDE the metadata cache lock.
+	 */
+	pthread_mutex_t metadata_socket_lock;
 	/* socket to exchange commands with sessiond */
 	char *consumer_command_sock_path;
 	/* communication with splice */