X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcommon%2Fust-consumer%2Fust-consumer.c;h=7b1c356347fbcdd8b254b4262047d9e9e74c9314;hb=0b0e08f7033e791cbaa12b733ea2b1df1bb9e110;hp=1068087225255705a1d2407a7642fef376bcde37;hpb=98cf381a6490116f27ed9d2de552c146339f8405;p=lttng-tools.git

diff --git a/src/common/ust-consumer/ust-consumer.c b/src/common/ust-consumer/ust-consumer.c
index 106808722..7b1c35634 100644
--- a/src/common/ust-consumer/ust-consumer.c
+++ b/src/common/ust-consumer/ust-consumer.c
@@ -653,6 +653,7 @@ static int close_metadata(uint64_t chan_key)
 	}
 
 	pthread_mutex_lock(&consumer_data.lock);
+	pthread_mutex_lock(&channel->lock);
 
 	if (cds_lfht_is_node_deleted(&channel->node.node)) {
 		goto error_unlock;
@@ -673,6 +674,7 @@ static int close_metadata(uint64_t chan_key)
 	}
 
 error_unlock:
+	pthread_mutex_unlock(&channel->lock);
 	pthread_mutex_unlock(&consumer_data.lock);
 error:
 	return ret;
@@ -776,7 +778,7 @@ int lttng_ustconsumer_recv_metadata(int sock, uint64_t key, uint64_t offset,
 	 * and ultimately try to get rid of this global consumer data lock.
 	 */
 	pthread_mutex_lock(&consumer_data.lock);
-
+	pthread_mutex_lock(&channel->lock);
 	pthread_mutex_lock(&channel->metadata_cache->lock);
 	ret = consumer_metadata_cache_write(channel, offset, len, metadata_str);
 	if (ret < 0) {
@@ -788,10 +790,12 @@ int lttng_ustconsumer_recv_metadata(int sock, uint64_t key, uint64_t offset,
 		 * waiting for the metadata cache to be flushed.
 		 */
 		pthread_mutex_unlock(&channel->metadata_cache->lock);
+		pthread_mutex_unlock(&channel->lock);
 		pthread_mutex_unlock(&consumer_data.lock);
 		goto end_free;
 	}
 	pthread_mutex_unlock(&channel->metadata_cache->lock);
+	pthread_mutex_unlock(&channel->lock);
 	pthread_mutex_unlock(&consumer_data.lock);
 
 	while (consumer_metadata_cache_flushed(channel, offset + len)) {
@@ -1413,6 +1417,11 @@ int lttng_ustconsumer_data_pending(struct lttng_consumer_stream *stream)
 
 	DBG("UST consumer checking data pending");
 
+	if (stream->endpoint_status != CONSUMER_ENDPOINT_ACTIVE) {
+		ret = 0;
+		goto end;
+	}
+
 	ret = ustctl_get_next_subbuf(stream->ustream);
 	if (ret == 0) {
 		/* There is still data so let's put back this subbuffer. */