X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fconsumer-timer.c;h=37c9861b906a0a81c6b08a302c73e486e6c6d3dd;hb=e5d1a9b33aa0920bbd9f6948bd0676156da67c61;hp=f9c41c0eb0f8f9f32def26028f743ce7df45d322;hpb=2b8f875486548c9d54d62ae465e2fb23c7023d2c;p=lttng-tools.git

diff --git a/src/common/consumer-timer.c b/src/common/consumer-timer.c
index f9c41c0eb..37c9861b9 100644
--- a/src/common/consumer-timer.c
+++ b/src/common/consumer-timer.c
@@ -56,6 +56,10 @@ static void setmask(sigset_t *mask)
 
 /*
  * Execute action on a timer switch.
+ *
+ * Beware: metadata_switch_timer() should *never* take a mutex also held
+ * while consumer_timer_switch_stop() is called. It would result in
+ * deadlocks.
  */
 static void metadata_switch_timer(struct lttng_consumer_local_data *ctx,
 		int sig, siginfo_t *si, void *uc)
@@ -74,7 +78,21 @@ static void metadata_switch_timer(struct lttng_consumer_local_data *ctx,
 	switch (ctx->type) {
 	case LTTNG_CONSUMER32_UST:
 	case LTTNG_CONSUMER64_UST:
-		ret = lttng_ustconsumer_request_metadata(ctx, channel);
+		/*
+		 * Locks taken by lttng_ustconsumer_request_metadata():
+		 * - metadata_socket_lock
+		 *   - Calling lttng_ustconsumer_recv_metadata():
+		 *     - channel->metadata_cache->lock
+		 *     - Calling consumer_metadata_cache_flushed():
+		 *       - channel->timer_lock
+		 *         - channel->metadata_cache->lock
+		 *
+		 * Ensure that neither consumer_data.lock nor
+		 * channel->lock are taken within this function, since
+		 * they are held while consumer_timer_switch_stop() is
+		 * called.
+		 */
+		ret = lttng_ustconsumer_request_metadata(ctx, channel, 1);
 		if (ret < 0) {
 			channel->switch_timer_error = 1;
 		}