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=3bb54f03983178f035fdcb345f8e1d7670557847;hb=40bbd087934edf0be7c21165786aad3fabb7e7b5;hpb=c8fea79c745d42ea8143b7020ae11b4fc2da0d8a

diff --git a/src/bin/lttng-sessiond/ust-consumer.c b/src/bin/lttng-sessiond/ust-consumer.c
index 3bb54f039..01d71ce01 100644
--- a/src/bin/lttng-sessiond/ust-consumer.c
+++ b/src/bin/lttng-sessiond/ust-consumer.c
@@ -32,6 +32,7 @@
 #include "ust-consumer.h"
 #include "buffer-registry.h"
 #include "session.h"
+#include "lttng-sessiond.h"
 
 /*
  * Return allocated full pathname of the session using the consumer trace path
@@ -52,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;
 	}
@@ -61,8 +65,10 @@ 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",
-				consumer->dst.trace_path, consumer->subdir, ua_sess->path);
+		ret = snprintf(pathname, LTTNG_PATH_MAX, "%s%s%s%s",
+				consumer->dst.session_root_path,
+				consumer->chunk_path,
+				consumer->subdir, ua_sess->path);
 		if (ret < 0) {
 			PERROR("snprintf channel path");
 			goto error;
@@ -78,7 +84,10 @@ static char *setup_trace_path(struct consumer_output *consumer,
 			}
 		}
 	} else {
-		ret = snprintf(pathname, PATH_MAX, "%s%s", consumer->subdir,
+		ret = snprintf(pathname, LTTNG_PATH_MAX, "%s%s%s%s",
+				consumer->dst.net.base_dir,
+				consumer->chunk_path,
+				consumer->subdir,
 				ua_sess->path);
 		if (ret < 0) {
 			PERROR("snprintf channel path");
@@ -94,7 +103,7 @@ error:
 }
 
 /*
- * Send a single channel to the consumer using command ADD_CHANNEL.
+ * Send a single channel to the consumer using command ASK_CHANNEL_CREATION.
  *
  * Consumer socket lock MUST be acquired before calling this.
  */
@@ -174,6 +183,7 @@ static int ask_channel_creation(struct ust_app_session *ua_sess,
 			ua_chan->attr.switch_timer_interval,
 			ua_chan->attr.read_timer_interval,
 			ua_sess->live_timer_interval,
+			ua_chan->monitor_timer_interval,
 			output,
 			(int) ua_chan->attr.type,
 			ua_sess->tracing_id,
@@ -190,6 +200,7 @@ static int ask_channel_creation(struct ust_app_session *ua_sess,
 			ua_sess->id,
 			ua_sess->output_traces,
 			ua_sess->uid,
+			ua_chan->attr.blocking_timeout,
 			root_shm_path, shm_path);
 
 	health_code_update();
@@ -223,6 +234,8 @@ error:
 /*
  * Ask consumer to create a channel for a given session.
  *
+ * Session list and rcu read side locks must be held by the caller.
+ *
  * Returns 0 on success else a negative value.
  */
 int ust_consumer_ask_channel(struct ust_app_session *ua_sess,
@@ -247,6 +260,7 @@ int ust_consumer_ask_channel(struct ust_app_session *ua_sess,
 	ret = ask_channel_creation(ua_sess, ua_chan, consumer, socket, registry);
 	pthread_mutex_unlock(socket->lock);
 	if (ret < 0) {
+		ERR("ask_channel_creation consumer command failed");
 		goto error;
 	}
 
@@ -311,7 +325,6 @@ int ust_consumer_get_channel(struct consumer_socket *socket,
 			free(stream);
 			if (ret == -LTTNG_UST_ERR_NOENT) {
 				DBG3("UST app consumer has no more stream available");
-				ret = 0;
 				break;
 			}
 			if (ret != -EPIPE) {
@@ -496,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