X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2Fsession.c;h=5d5aa4c643d8e0d289fd9499d177277fdd068c81;hp=00dfbd7d2e6e5c873b01dd66b80a7d3098198162;hb=7145f5e9af16907c65a514fe9112e99564cf6333;hpb=6ec9dc48cf7f3d5e1fc01f741197c0bacc94bbf0

diff --git a/src/bin/lttng-relayd/session.c b/src/bin/lttng-relayd/session.c
index 00dfbd7d2..5d5aa4c64 100644
--- a/src/bin/lttng-relayd/session.c
+++ b/src/bin/lttng-relayd/session.c
@@ -181,6 +181,38 @@ static int init_session_output_path(struct relay_session *session)
 	return ret;
 }
 
+static struct lttng_directory_handle *session_create_output_directory_handle(
+		struct relay_session *session)
+{
+	int ret;
+	/*
+	 * relayd_output_path/session_directory
+	 * e.g. /home/user/lttng-traces/hostname/session_name
+	 */
+	char *full_session_path = NULL;
+	struct lttng_directory_handle *handle = NULL;
+
+	pthread_mutex_lock(&session->lock);
+	full_session_path = create_output_path(session->output_path);
+	if (!full_session_path) {
+		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;
+	}
+
+	handle = lttng_directory_handle_create(full_session_path);
+end:
+	pthread_mutex_unlock(&session->lock);
+	free(full_session_path);
+	return handle;
+}
+
 static int session_set_anonymous_chunk(struct relay_session *session)
 {
 	int ret = 0;
@@ -209,6 +241,8 @@ static int session_set_anonymous_chunk(struct relay_session *session)
 		ret = -1;
 		goto end;
 	}
+
+	lttng_trace_chunk_set_fd_tracker(chunk, the_fd_tracker);
 	output_directory = NULL;
 	session->current_trace_chunk = chunk;
 	chunk = NULL;
@@ -353,6 +387,9 @@ struct relay_session *session_create(const char *session_name,
 	}
 
 	if (id_sessiond && current_chunk_id) {
+		enum lttng_trace_chunk_status chunk_status;
+		struct lttng_directory_handle *session_output_directory;
+
 		session->current_trace_chunk =
 				sessiond_trace_chunk_registry_get_chunk(
 					sessiond_trace_chunk_registry,
@@ -366,7 +403,18 @@ struct relay_session *session_create(const char *session_name,
 			ERR("Could not find trace chunk: sessiond = {%s}, sessiond session id = %" PRIu64 ", trace chunk id = %" PRIu64,
 					uuid_str, *id_sessiond,
 					*current_chunk_id);
+			goto error;
                 }
+
+		chunk_status = lttng_trace_chunk_get_session_output_directory_handle(
+				session->current_trace_chunk,
+				&session_output_directory);
+		if (chunk_status != LTTNG_TRACE_CHUNK_STATUS_OK) {
+			goto error;
+		}
+
+		assert(session_output_directory);
+		session->output_directory = session_output_directory;
 	} else if (!id_sessiond) {
 		/*
 		 * Pre-2.11 peers will not announce trace chunks. An
@@ -377,6 +425,12 @@ struct relay_session *session_create(const char *session_name,
 		if (ret) {
 			goto error;
 		}
+	} else {
+		session->output_directory =
+				session_create_output_directory_handle(session);
+		if (!session->output_directory) {
+			goto error;
+		}
 	}
 
 	lttng_ht_add_unique_u64(sessions_ht, &session->session_n);
@@ -466,6 +520,8 @@ static void destroy_session(struct relay_session *session)
 	ret = sessiond_trace_chunk_registry_session_destroyed(
 			sessiond_trace_chunk_registry, session->sessiond_uuid);
 	assert(!ret);
+	lttng_directory_handle_put(session->output_directory);
+	session->output_directory = NULL;
 	call_rcu(&session->rcu_node, rcu_destroy_session);
 }
 
@@ -561,35 +617,3 @@ void print_sessions(void)
 	}
 	rcu_read_unlock();
 }
-
-struct lttng_directory_handle *session_create_output_directory_handle(
-		struct relay_session *session)
-{
-	int ret;
-	/*
-	 * relayd_output_path/session_directory
-	 * e.g. /home/user/lttng-traces/hostname/session_name
-	 */
-	char *full_session_path = NULL;
-	struct lttng_directory_handle *handle = NULL;
-
-	pthread_mutex_lock(&session->lock);
-	full_session_path = create_output_path(session->output_path);
-	if (!full_session_path) {
-		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;
-	}
-
-	handle = lttng_directory_handle_create(full_session_path);
-end:
-	pthread_mutex_unlock(&session->lock);
-	free(full_session_path);
-	return handle;
-}