X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fconsumer.c;h=d376c9ee3cc31ff7817d9a99146f88fd8e806c45;hb=f712d514886149264901acd6ab776404092d9d67;hp=d6a6e8cbd4b39e0027f1d9c6a32dbbb074472e6b;hpb=ecd1a12fac39784bded85c0f06e47ace2dc98cde;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/consumer.c b/src/bin/lttng-sessiond/consumer.c
index d6a6e8cbd..d376c9ee3 100644
--- a/src/bin/lttng-sessiond/consumer.c
+++ b/src/bin/lttng-sessiond/consumer.c
@@ -38,6 +38,61 @@
 #include "utils.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.
+ */
+char *setup_channel_trace_path(struct consumer_output *consumer,
+		const char *session_path)
+{
+	int ret;
+	char *pathname;
+
+	assert(consumer);
+	assert(session_path);
+
+	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,
+				session_path);
+	} else {
+		ret = snprintf(pathname, LTTNG_PATH_MAX, "%s%s",
+				consumer->domain_subdir, session_path);
+	}
+	DBG3("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");
+		goto error;
+	}
+
+	return pathname;
+error:
+	free(pathname);
+	return NULL;
+}
+
 /*
  * Send a data payload using a given consumer socket of size len.
  *
@@ -1096,9 +1151,10 @@ int consumer_send_relayd_socket(struct consumer_socket *consumer_sock,
 
 	if (type == LTTNG_STREAM_CONTROL) {
 		char output_path[LTTNG_PATH_MAX] = {};
+		uint64_t relayd_session_id;
 
 		ret = relayd_create_session(rsock,
-				&msg.u.relayd_sock.relayd_session_id,
+				&relayd_session_id,
 				session_name, hostname, base_path,
 				session_live_timer,
 				consumer->snapshot, session_id,
@@ -1111,6 +1167,7 @@ int consumer_send_relayd_socket(struct consumer_socket *consumer_sock,
 			(void) relayd_close(rsock);
 			goto error;
 		}
+		msg.u.relayd_sock.relayd_session_id = relayd_session_id;
 		DBG("Created session on relay, output path reply: %s",
 			output_path);
 	}
@@ -1133,7 +1190,7 @@ int consumer_send_relayd_socket(struct consumer_socket *consumer_sock,
 	}
 
 	DBG3("Sending relayd socket file descriptor to consumer");
-	ret = consumer_send_fds(consumer_sock, &rsock->sock.fd, 1);
+	ret = consumer_send_fds(consumer_sock, ALIGNED_CONST_PTR(rsock->sock.fd), 1);
 	if (ret < 0) {
 		goto error;
 	}