X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fconsumer.h;h=bedc8885dbc97e6c67faa5f5d5a41917eabf7531;hb=8c924c7bfb12055ac5f87960501c888efb24c82e;hp=fe396c017a6f4109291d95aa64d50a462c7a3dcb;hpb=feb78e88e113ec8c6918253e93136b5f6235ad31;p=lttng-tools.git

diff --git a/src/common/consumer.h b/src/common/consumer.h
index fe396c017..bedc8885d 100644
--- a/src/common/consumer.h
+++ b/src/common/consumer.h
@@ -172,12 +172,29 @@ struct lttng_consumer_channel {
 	/*
 	 * Channel lock.
 	 *
+	 * This lock protects against concurrent update of channel.
+	 *
 	 * This is nested INSIDE the consumer data lock.
+	 * This is nested OUTSIDE the channel timer 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;
+
+	/*
+	 * Channel teardown lock.
+	 *
+	 * This lock protect against teardown of channel. It is _never_
+	 * taken by the timer handler.
+	 *
+	 * This is nested INSIDE the consumer data lock.
+	 * This is nested INSIDE the channel 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 timer_lock;
 };
 
 /*
@@ -258,6 +275,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 INSIDE the channel timer lock.
 	 * This is nested OUTSIDE consumer_relayd_sock_pair lock.
 	 */
 	pthread_mutex_t lock;
@@ -396,8 +414,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 */