X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fust-consumer.c;fp=src%2Fbin%2Flttng-sessiond%2Fust-consumer.c;h=9ab54e9d7a64553f9e0d61d31d2e54661ad67ef9;hp=f9a29e49ecd2625f8e6503a8a66a812d1bb72957;hb=3b9677124ab48bddc945ca67947c49b87b5853e0;hpb=ecd1a12fac39784bded85c0f06e47ace2dc98cde

diff --git a/src/bin/lttng-sessiond/ust-consumer.c b/src/bin/lttng-sessiond/ust-consumer.c
index f9a29e49e..9ab54e9d7 100644
--- a/src/bin/lttng-sessiond/ust-consumer.c
+++ b/src/bin/lttng-sessiond/ust-consumer.c
@@ -34,62 +34,6 @@
 #include "session.h"
 #include "lttng-sessiond.h"
 
-/*
- * Return allocated full pathname of the session using the consumer trace path
- * and subdir if available.
- *
- * The caller can safely free(3) the returned value. On error, NULL is
- * returned.
- */
-static char *setup_channel_trace_path(struct consumer_output *consumer,
-		struct ust_app_session *ua_sess)
-{
-	int ret;
-	char *pathname;
-
-	assert(consumer);
-	assert(ua_sess);
-
-	health_code_update();
-
-	/*
-	 * Allocate the string ourself to make sure we never exceed
-	 * LTTNG_PATH_MAX.
-	 */
-	pathname = zmalloc(LTTNG_PATH_MAX);
-	if (!pathname) {
-		goto error;
-	}
-
-	/* Get correct path name destination */
-	if (consumer->type == CONSUMER_DST_NET &&
-			consumer->relay_major_version == 2 &&
-			consumer->relay_minor_version < 11) {
-		ret = snprintf(pathname, LTTNG_PATH_MAX, "%s%s/%s%s",
-				consumer->dst.net.base_dir,
-				consumer->chunk_path, consumer->domain_subdir,
-				ua_sess->path);
-	} else {
-		ret = snprintf(pathname, LTTNG_PATH_MAX, "%s%s",
-				consumer->domain_subdir, ua_sess->path);
-	}
-	DBG3("Userspace consumer trace path relative to current trace chunk: \"%s\"",
-			pathname);
-	if (ret < 0) {
-		PERROR("Failed to format channel path");
-		goto error;
-	} else if (ret >= LTTNG_PATH_MAX) {
-		ERR("Truncation occurred while formatting channel path");
-		ret = -1;
-		goto error;
-	}
-
-	return pathname;
-error:
-	free(pathname);
-	return NULL;
-}
-
 /*
  * Send a single channel to the consumer using command ASK_CHANNEL_CREATION.
  *
@@ -122,7 +66,7 @@ static int ask_channel_creation(struct ust_app_session *ua_sess,
 
 	is_local_trace = consumer->net_seq_index == -1ULL;
 	/* Format the channel's path (relative to the current trace chunk). */
-	pathname = setup_channel_trace_path(consumer, ua_sess);
+	pathname = setup_channel_trace_path(consumer, ua_sess->path);
 	if (!pathname) {
 		ret = -1;
 		goto error;