X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fcommon%2Fust-consumer%2Fust-consumer.c;h=21d7050b6761c1ebff8f0721f2e64379c68d06e5;hb=ace17efaf90b672f303b22959146c01793e9d4b2;hp=6b47ec0c9b2739cb04b07808a03890eee065e2fa;hpb=04ef1097c8f54a151c899c1773ac56907c97694d;p=lttng-tools.git

diff --git a/src/common/ust-consumer/ust-consumer.c b/src/common/ust-consumer/ust-consumer.c
index 6b47ec0c9..21d7050b6 100644
--- a/src/common/ust-consumer/ust-consumer.c
+++ b/src/common/ust-consumer/ust-consumer.c
@@ -1039,17 +1039,6 @@ int lttng_ustconsumer_recv_metadata(int sock, uint64_t key, uint64_t offset,
 		goto end_free;
 	}
 
-	/*
-	 * XXX: The consumer data lock is acquired before calling metadata cache
-	 * write which calls push metadata that MUST be protected by the consumer
-	 * lock in order to be able to check the validity of the metadata stream of
-	 * the channel.
-	 *
-	 * Note that this will be subject to change to better fine grained locking
-	 * 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) {
@@ -1061,13 +1050,9 @@ 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)) {
 		DBG("Waiting for metadata to be flushed");
@@ -1890,6 +1875,7 @@ int lttng_ustconsumer_request_metadata(struct lttng_consumer_local_data *ctx,
 			channel->session_id,
 			channel->session_id_per_pid);
 
+	pthread_mutex_lock(&ctx->metadata_socket_lock);
 	ret = lttcomm_send_unix_sock(ctx->consumer_metadata_socket, &request,
 			sizeof(request));
 	if (ret < 0) {
@@ -1955,5 +1941,6 @@ int lttng_ustconsumer_request_metadata(struct lttng_consumer_local_data *ctx,
 	ret = 0;
 
 end:
+	pthread_mutex_unlock(&ctx->metadata_socket_lock);
 	return ret;
 }