X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fust-consumer.c;h=75d7170d2752f4d952d8d8a69bd27eed0243d565;hb=8a43dff7f69c44c8086def3e78557480add18a94;hp=9715c426f468f5b24cf76bf64726b0cf218d5af3;hpb=53efb85a242809ed5ed21e9ab40effa696ecbc6f;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/ust-consumer.c b/src/bin/lttng-sessiond/ust-consumer.c
index 9715c426f..75d7170d2 100644
--- a/src/bin/lttng-sessiond/ust-consumer.c
+++ b/src/bin/lttng-sessiond/ust-consumer.c
@@ -308,7 +308,7 @@ int ust_consumer_get_channel(struct consumer_socket *socket,
 		cds_list_add_tail(&stream->list, &ua_chan->streams.head);
 		ua_chan->streams.count++;
 
-		DBG2("UST app stream %d received succesfully", ua_chan->streams.count);
+		DBG2("UST app stream %d received successfully", ua_chan->streams.count);
 	}
 
 	/* This MUST match or else we have a synchronization problem. */
@@ -383,8 +383,8 @@ int ust_consumer_send_stream_to_ust(struct ust_app *app,
 	ret = ustctl_send_stream_to_ust(app->sock, channel->obj, stream->obj);
 	if (ret < 0) {
 		if (ret != -EPIPE && ret != -LTTNG_UST_ERR_EXITING) {
-			ERR("Error ustctl send stream %s to app pid: %d with ret %d",
-					stream->name, app->pid, ret);
+			ERR("ustctl send stream handle %d to app pid: %d with ret %d",
+					stream->obj->handle, app->pid, ret);
 		} else {
 			DBG3("UST app send stream to ust failed. Application is dead.");
 		}
@@ -447,12 +447,12 @@ int ust_consumer_metadata_request(struct consumer_socket *socket)
 	assert(socket);
 
 	rcu_read_lock();
-	pthread_mutex_lock(socket->lock);
-
 	health_code_update();
 
 	/* Wait for a metadata request */
+	pthread_mutex_lock(socket->lock);
 	ret = consumer_socket_recv(socket, &request, sizeof(request));
+	pthread_mutex_unlock(socket->lock);
 	if (ret < 0) {
 		goto end;
 	}
@@ -487,17 +487,21 @@ int ust_consumer_metadata_request(struct consumer_socket *socket)
 	}
 	assert(ust_reg);
 
+	pthread_mutex_lock(&ust_reg->lock);
 	ret_push = ust_app_push_metadata(ust_reg, socket, 1);
-	if (ret_push < 0) {
+	pthread_mutex_unlock(&ust_reg->lock);
+	if (ret_push == -EPIPE) {
+		DBG("Application or relay closed while pushing metadata");
+	} else if (ret_push < 0) {
 		ERR("Pushing metadata");
 		ret = -1;
 		goto end;
+	} else {
+		DBG("UST Consumer metadata pushed successfully");
 	}
-	DBG("UST Consumer metadata pushed successfully");
 	ret = 0;
 
 end:
-	pthread_mutex_unlock(socket->lock);
 	rcu_read_unlock();
 	return ret;
 }