X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=src%2Fcommon%2Fconsumer-metadata-cache.c;h=473ab231a9100a278afec61c1844738e1f027df2;hb=f0e1c78570c3a9f98489696672e1286fe79091fd;hp=e21fd4c73cb0b8c4b5d8990500c5d1188909a33e;hpb=6ca1a6b0dc9c72eeb6451a5a5f4cbf468c4de08c;p=lttng-tools.git

diff --git a/src/common/consumer-metadata-cache.c b/src/common/consumer-metadata-cache.c
index e21fd4c73..473ab231a 100644
--- a/src/common/consumer-metadata-cache.c
+++ b/src/common/consumer-metadata-cache.c
@@ -193,7 +193,7 @@ void consumer_metadata_cache_destroy(struct lttng_consumer_channel *channel)
  * Return 0 if everything has been flushed, 1 if there is data not flushed.
  */
 int consumer_metadata_cache_flushed(struct lttng_consumer_channel *channel,
-		uint64_t offset)
+		uint64_t offset, int timer)
 {
 	int ret;
 	struct consumer_metadata_cache *cache;
@@ -204,12 +204,15 @@ int consumer_metadata_cache_flushed(struct lttng_consumer_channel *channel,
 	cache = channel->metadata_cache;
 
 	/*
-	 * XXX This consumer_data.lock should eventually be replaced by
-	 * a channel lock. It protects metadata_stream read and endpoint
-	 * status check.
+	 * If not called from a timer handler, we have to take the
+	 * channel lock to be mutually exclusive with channel teardown.
+	 * Timer handler does not need to take this lock because it is
+	 * already synchronized by timer stop (and, more importantly,
+	 * taking this lock in a timer handler would cause a deadlock).
 	 */
-	pthread_mutex_lock(&consumer_data.lock);
-	pthread_mutex_lock(&channel->lock);
+	if (!timer) {
+		pthread_mutex_lock(&channel->lock);
+	}
 	pthread_mutex_lock(&channel->timer_lock);
 	pthread_mutex_lock(&channel->metadata_cache->lock);
 
@@ -232,8 +235,9 @@ int consumer_metadata_cache_flushed(struct lttng_consumer_channel *channel,
 
 	pthread_mutex_unlock(&channel->metadata_cache->lock);
 	pthread_mutex_unlock(&channel->timer_lock);
-	pthread_mutex_unlock(&channel->lock);
-	pthread_mutex_unlock(&consumer_data.lock);
+	if (!timer) {
+		pthread_mutex_unlock(&channel->lock);
+	}
 
 	return ret;
 }