X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2Fsession.c;h=2f65848a9cedc2ed18bd56a630541b6922db8905;hp=f65450f01aa249a1536818f155a4b97dac9fae6f;hb=317eadef3cb6e74992824cad4c1193b6dc1e9fdf;hpb=d519f442b77472a41a4ca4efc147e781f98976e9

diff --git a/src/bin/lttng-relayd/session.c b/src/bin/lttng-relayd/session.c
index f65450f01..2f65848a9 100644
--- a/src/bin/lttng-relayd/session.c
+++ b/src/bin/lttng-relayd/session.c
@@ -23,12 +23,15 @@
 #include <common/compat/uuid.h>
 #include <urcu/rculist.h>
 
+#include <sys/stat.h>
+
 #include "ctf-trace.h"
 #include "lttng-relayd.h"
 #include "session.h"
 #include "sessiond-trace-chunks.h"
 #include "stream.h"
 #include <common/defaults.h>
+#include "utils.h"
 
 /* Global session id used in the session creation. */
 static uint64_t last_relay_session_id;
@@ -128,31 +131,8 @@ static int session_set_anonymous_chunk(struct relay_session *session)
 	struct lttng_trace_chunk *chunk = NULL;
 	enum lttng_trace_chunk_status status;
 	struct lttng_directory_handle output_directory;
-	char *output_path;
-	bool output_path_allocated = false;
-
-	if (!opt_output_path) {
-		/* No output path defined */
-		const char *home_dir = utils_get_home_dir();
-		if (!home_dir) {
-			ERR("Home path not found."
-					" Please specify an output path using -o, --output PATH");
-			ret = -1;
-			goto end;
-		}
-		ret = asprintf(&output_path, "%s/%s", home_dir, DEFAULT_TRACE_DIR_NAME);
-		if (ret < 0) {
-			PERROR("asprintf trace dir name");
-			ret = -1;
-			goto end;
-		}
-		output_path_allocated = true;
-	} else {
-		output_path = opt_output_path;
-		output_path_allocated = false;
-	}
 
-	ret = lttng_directory_handle_init(&output_directory, output_path);
+	ret = session_init_output_directory_handle(session, &output_directory);
 	if (ret) {
 		goto end;
 	}
@@ -178,9 +158,6 @@ static int session_set_anonymous_chunk(struct relay_session *session)
 end:
 	lttng_trace_chunk_put(chunk);
 	lttng_directory_handle_fini(&output_directory);
-	if (output_path_allocated) {
-		free(output_path);
-	}
 	return ret;
 }
 
@@ -204,17 +181,21 @@ struct relay_session *session_create(const char *session_name,
 	int ret;
 	struct relay_session *session = NULL;
 
-	if (session_name && strstr(session_name, ".")) {
+	assert(session_name);
+	assert(hostname);
+	assert(base_path);
+
+	if (strstr(session_name, ".")) {
 		ERR("Illegal character in session name: \"%s\"",
 				session_name);
 		goto error;
 	}
-	if (base_path && strstr(base_path, "../")) {
+	if (strstr(base_path, "../")) {
 		ERR("Invalid session base path walks up the path hierarchy: \"%s\"",
 				base_path);
 		goto error;
 	}
-	if (hostname && strstr(hostname, ".")) {
+	if (strstr(hostname, ".")) {
 		ERR("Invalid character in hostname: \"%s\"",
 				hostname);
 		goto error;
@@ -412,6 +393,9 @@ void session_release(struct urcu_ref *ref)
 
 void session_put(struct relay_session *session)
 {
+	if (!session) {
+		return;
+	}
 	rcu_read_lock();
 	urcu_ref_put(&session->ref, session_release);
 	rcu_read_unlock();
@@ -491,3 +475,38 @@ void print_sessions(void)
 	}
 	rcu_read_unlock();
 }
+
+int session_init_output_directory_handle(struct relay_session *session,
+		struct lttng_directory_handle *handle)
+{
+	int ret;
+	/*
+	 * relayd_output_path/session_directory
+	 * e.g. /home/user/lttng-traces/hostname/session_name
+	 */
+	char *full_session_path = NULL;
+
+	pthread_mutex_lock(&session->lock);
+	full_session_path = create_output_path(session->output_path);
+	if (!full_session_path) {
+		ret = -1;
+		goto end;
+	}
+
+	ret = utils_mkdir_recursive(
+			full_session_path, S_IRWXU | S_IRWXG, -1, -1);
+	if (ret) {
+		ERR("Failed to create session output path \"%s\"",
+				full_session_path);
+		goto end;
+	}
+
+	ret = lttng_directory_handle_init(handle, full_session_path);
+	if (ret) {
+		goto end;
+	}
+end:
+	pthread_mutex_unlock(&session->lock);
+	free(full_session_path);
+	return ret;
+}