X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fust-consumer.c;h=11318dbf1242b16837af564ac5e0acacb7f72cac;hb=78c8ffd33e60e2eaee890cb2485e85a04b93381b;hp=78e50df43fab90dab22892095f85050e1b1d2e11;hpb=3d07185530211f3a650a7218199af44d4c77bf13;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/ust-consumer.c b/src/bin/lttng-sessiond/ust-consumer.c
index 78e50df43..11318dbf1 100644
--- a/src/bin/lttng-sessiond/ust-consumer.c
+++ b/src/bin/lttng-sessiond/ust-consumer.c
@@ -15,7 +15,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#define _GNU_SOURCE
 #define _LGPL_SOURCE
 #include <errno.h>
 #include <stdio.h>
@@ -25,7 +24,7 @@
 #include <inttypes.h>
 
 #include <common/common.h>
-#include <common/consumer.h>
+#include <common/consumer/consumer.h>
 #include <common/defaults.h>
 
 #include "consumer.h"
@@ -73,7 +72,7 @@ static char *setup_trace_path(struct consumer_output *consumer,
 		ret = run_as_mkdir_recursive(pathname, S_IRWXU | S_IRWXG,
 				ua_sess->euid, ua_sess->egid);
 		if (ret < 0) {
-			if (ret != -EEXIST) {
+			if (errno != EEXIST) {
 				ERR("Trace directory creation error");
 				goto error;
 			}
@@ -245,14 +244,13 @@ int ust_consumer_ask_channel(struct ust_app_session *ua_sess,
 	}
 
 	pthread_mutex_lock(socket->lock);
-
 	ret = ask_channel_creation(ua_sess, ua_chan, consumer, socket, registry);
+	pthread_mutex_unlock(socket->lock);
 	if (ret < 0) {
 		goto error;
 	}
 
 error:
-	pthread_mutex_unlock(socket->lock);
 	return ret;
 }
 
@@ -401,7 +399,9 @@ int ust_consumer_send_stream_to_ust(struct ust_app *app,
 	DBG2("UST consumer send stream to app %d", app->sock);
 
 	/* Relay stream to application. */
+	pthread_mutex_lock(&app->sock_lock);
 	ret = ustctl_send_stream_to_ust(app->sock, channel->obj, stream->obj);
+	pthread_mutex_unlock(&app->sock_lock);
 	if (ret < 0) {
 		if (ret != -EPIPE && ret != -LTTNG_UST_ERR_EXITING) {
 			ERR("ustctl send stream handle %d to app pid: %d with ret %d",
@@ -436,7 +436,9 @@ int ust_consumer_send_channel_to_ust(struct ust_app *app,
 			app->sock, app->pid, channel->name, channel->tracing_channel_id);
 
 	/* Send stream to application. */
+	pthread_mutex_lock(&app->sock_lock);
 	ret = ustctl_send_channel_to_ust(app->sock, ua_sess->handle, channel->obj);
+	pthread_mutex_unlock(&app->sock_lock);
 	if (ret < 0) {
 		if (ret != -EPIPE && ret != -LTTNG_UST_ERR_EXITING) {
 			ERR("Error ustctl send channel %s to app pid: %d with ret %d",
@@ -494,7 +496,9 @@ int ust_consumer_metadata_request(struct consumer_socket *socket)
 
 			memset(&msg, 0, sizeof(msg));
 			msg.cmd_type = LTTNG_ERR_UND;
+			pthread_mutex_lock(socket->lock);
 			(void) consumer_send_msg(socket, &msg);
+			pthread_mutex_unlock(socket->lock);
 			/*
 			 * This is possible since the session might have been destroyed
 			 * during a consumer metadata request. So here, return gracefully
@@ -511,12 +515,15 @@ int ust_consumer_metadata_request(struct consumer_socket *socket)
 	pthread_mutex_lock(&ust_reg->lock);
 	ret_push = ust_app_push_metadata(ust_reg, socket, 1);
 	pthread_mutex_unlock(&ust_reg->lock);
-	if (ret_push < 0) {
+	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: