X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fconsumer-metadata-cache.c;h=d8f5001f8b5efed8d12239a4856d46bde3939709;hb=3d229795de7f38cce87d6d5ea76ef413dbb71f1d;hp=5967a8eb296a51041f754622f65bb0b706ffe393;hpb=ec6ea7d01adc8a9d1481ba645b282c92ec27208e;p=lttng-tools.git

diff --git a/src/common/consumer-metadata-cache.c b/src/common/consumer-metadata-cache.c
index 5967a8eb2..d8f5001f8 100644
--- a/src/common/consumer-metadata-cache.c
+++ b/src/common/consumer-metadata-cache.c
@@ -81,6 +81,7 @@ int consumer_metadata_cache_write(struct lttng_consumer_channel *channel,
 		unsigned int offset, unsigned int len, char *data)
 {
 	int ret = 0;
+	int size_ret;
 	struct consumer_metadata_cache *cache;
 
 	assert(channel);
@@ -109,10 +110,11 @@ int consumer_metadata_cache_write(struct lttng_consumer_channel *channel,
 
 		cache->contiguous = cache->max_offset;
 		if (channel->monitor) {
-			ret = write(channel->metadata_stream->ust_metadata_poll_pipe[1],
+			size_ret = lttng_write(channel->metadata_stream->ust_metadata_poll_pipe[1],
 					&dummy, 1);
-			if (ret < 1) {
+			if (size_ret < 1) {
 				ERR("Wakeup UST metadata pipe");
+				ret = -1;
 				goto end;
 			}
 		}
@@ -190,7 +192,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 = 0;
 	struct lttng_consumer_stream *metadata_stream;
@@ -199,12 +201,15 @@ int consumer_metadata_cache_flushed(struct lttng_consumer_channel *channel,
 	assert(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);
 
@@ -229,8 +234,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;
 }