X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fust-consumer.c;h=6be57e447809cbf1a918490452c2ff893ee9a977;hb=fb9a95c4d6242bd8336b638c90a7d8f846125659;hp=01d71ce01e34f9a58f13feca4ec6f520e9664bf7;hpb=34e09c4955f3fa34f977de433eac75bca8836066;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/ust-consumer.c b/src/bin/lttng-sessiond/ust-consumer.c
index 01d71ce01..6be57e447 100644
--- a/src/bin/lttng-sessiond/ust-consumer.c
+++ b/src/bin/lttng-sessiond/ust-consumer.c
@@ -65,10 +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, LTTNG_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);
+				consumer->domain_subdir, ua_sess->path);
 		if (ret < 0) {
 			PERROR("snprintf channel path");
 			goto error;
@@ -84,10 +84,10 @@ static char *setup_trace_path(struct consumer_output *consumer,
 			}
 		}
 	} else {
-		ret = snprintf(pathname, LTTNG_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,
+				consumer->domain_subdir,
 				ua_sess->path);
 		if (ret < 0) {
 			PERROR("snprintf channel path");
@@ -108,8 +108,11 @@ error:
  * Consumer socket lock MUST be acquired before calling this.
  */
 static int ask_channel_creation(struct ust_app_session *ua_sess,
-		struct ust_app_channel *ua_chan, struct consumer_output *consumer,
-		struct consumer_socket *socket, struct ust_registry_session *registry)
+		struct ust_app_channel *ua_chan,
+		struct consumer_output *consumer,
+		struct consumer_socket *socket,
+		struct ust_registry_session *registry,
+		uint64_t trace_archive_id)
 {
 	int ret, output;
 	uint32_t chan_id;
@@ -201,7 +204,8 @@ static int ask_channel_creation(struct ust_app_session *ua_sess,
 			ua_sess->output_traces,
 			ua_sess->uid,
 			ua_chan->attr.blocking_timeout,
-			root_shm_path, shm_path);
+			root_shm_path, shm_path,
+			trace_archive_id);
 
 	health_code_update();
 
@@ -239,8 +243,11 @@ error:
  * Returns 0 on success else a negative value.
  */
 int ust_consumer_ask_channel(struct ust_app_session *ua_sess,
-		struct ust_app_channel *ua_chan, struct consumer_output *consumer,
-		struct consumer_socket *socket, struct ust_registry_session *registry)
+		struct ust_app_channel *ua_chan,
+		struct consumer_output *consumer,
+		struct consumer_socket *socket,
+		struct ust_registry_session *registry,
+		uint64_t trace_archive_id)
 {
 	int ret;
 
@@ -257,7 +264,8 @@ 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);
+	ret = ask_channel_creation(ua_sess, ua_chan, consumer, socket, registry,
+			trace_archive_id);
 	pthread_mutex_unlock(socket->lock);
 	if (ret < 0) {
 		ERR("ask_channel_creation consumer command failed");