X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fust-consumer.c;h=01d71ce01e34f9a58f13feca4ec6f520e9664bf7;hp=eac9956574e6c9e9b284c7d8ef6dd12e9768a370;hb=40bbd087934edf0be7c21165786aad3fabb7e7b5;hpb=2b29c638278807c1536634ce49f0c9c053b3ab5f

diff --git a/src/bin/lttng-sessiond/ust-consumer.c b/src/bin/lttng-sessiond/ust-consumer.c
index eac995657..01d71ce01 100644
--- a/src/bin/lttng-sessiond/ust-consumer.c
+++ b/src/bin/lttng-sessiond/ust-consumer.c
@@ -53,8 +53,11 @@ static char *setup_trace_path(struct consumer_output *consumer,
 
 	health_code_update();
 
-	/* Allocate our self the string to make sure we never exceed PATH_MAX. */
-	pathname = zmalloc(PATH_MAX);
+	/*
+	 * Allocate the string ourself to make sure we never exceed
+	 * LTTNG_PATH_MAX.
+	 */
+	pathname = zmalloc(LTTNG_PATH_MAX);
 	if (!pathname) {
 		goto error;
 	}
@@ -62,7 +65,7 @@ static char *setup_trace_path(struct consumer_output *consumer,
 	/* Get correct path name destination */
 	if (consumer->type == CONSUMER_DST_LOCAL) {
 		/* Set application path to the destination path */
-		ret = snprintf(pathname, PATH_MAX, "%s%s%s%s",
+		ret = snprintf(pathname, LTTNG_PATH_MAX, "%s%s%s%s",
 				consumer->dst.session_root_path,
 				consumer->chunk_path,
 				consumer->subdir, ua_sess->path);
@@ -81,7 +84,7 @@ static char *setup_trace_path(struct consumer_output *consumer,
 			}
 		}
 	} else {
-		ret = snprintf(pathname, PATH_MAX, "%s%s%s%s",
+		ret = snprintf(pathname, LTTNG_PATH_MAX, "%s%s%s%s",
 				consumer->dst.net.base_dir,
 				consumer->chunk_path,
 				consumer->subdir,
@@ -240,7 +243,6 @@ int ust_consumer_ask_channel(struct ust_app_session *ua_sess,
 		struct consumer_socket *socket, struct ust_registry_session *registry)
 {
 	int ret;
-	struct ltt_session *session;
 
 	assert(ua_sess);
 	assert(ua_chan);
@@ -254,9 +256,6 @@ int ust_consumer_ask_channel(struct ust_app_session *ua_sess,
 		goto error;
 	}
 
-	session = session_find_by_id(ua_sess->tracing_id);
-	assert(session);
-
 	pthread_mutex_lock(socket->lock);
 	ret = ask_channel_creation(ua_sess, ua_chan, consumer, socket, registry);
 	pthread_mutex_unlock(socket->lock);
@@ -510,7 +509,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