X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2Fsession.c;h=1359e9f4b455833e58b74ace6be4e45f616dc48c;hb=a620c891bde6720d24c9c391fdcbc070d319d04c;hp=e087b51c3b71ceece2d66d71faa6b3d62d905810;hpb=1e791a74976525f287944e5dbb65208a3b9edf42;p=lttng-tools.git

diff --git a/src/bin/lttng-relayd/session.c b/src/bin/lttng-relayd/session.c
index e087b51c3..1359e9f4b 100644
--- a/src/bin/lttng-relayd/session.c
+++ b/src/bin/lttng-relayd/session.c
@@ -19,14 +19,15 @@
 
 #define _LGPL_SOURCE
 #include <common/common.h>
+#include <common/utils.h>
 #include <common/compat/uuid.h>
 #include <urcu/rculist.h>
 
-#include "lttng-relayd.h"
 #include "ctf-trace.h"
+#include "lttng-relayd.h"
 #include "session.h"
-#include "stream.h"
 #include "sessiond-trace-chunks.h"
+#include "stream.h"
 
 /* Global session id used in the session creation. */
 static uint64_t last_relay_session_id;
@@ -38,8 +39,20 @@ 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 *base_path = opt_output_path;
+
+	if (base_path == NULL) {
+		/* No output path defined */
+		base_path = utils_get_home_dir();
+		if (base_path == NULL) {
+			ERR("Home path not found.\n \
+					Please specify an output path using -o, --output PATH");
+			ret = -1;
+			goto end;
+		}
+	}
 
-	ret = lttng_directory_handle_init(&output_directory, opt_output_path);
+	ret = lttng_directory_handle_init(&output_directory, base_path);
 	if (ret) {
 		goto end;
 	}
@@ -74,10 +87,15 @@ end:
  * Return allocated session or else NULL.
  */
 struct relay_session *session_create(const char *session_name,
-		const char *hostname, uint32_t live_timer,
-		bool snapshot, const lttng_uuid sessiond_uuid,
-		uint64_t *id_sessiond, uint64_t *current_chunk_id,
-		uint32_t major, uint32_t minor)
+		const char *hostname,
+		uint32_t live_timer,
+		bool snapshot,
+		const lttng_uuid sessiond_uuid,
+		const uint64_t *id_sessiond,
+		const uint64_t *current_chunk_id,
+		const time_t *creation_time,
+		uint32_t major,
+		uint32_t minor)
 {
 	int ret;
 	struct relay_session *session;
@@ -156,6 +174,9 @@ struct relay_session *session_create(const char *session_name,
 	}
 
 	lttng_ht_add_unique_u64(sessions_ht, &session->session_n);
+	if (creation_time) {
+		LTTNG_OPTIONAL_SET(&session->creation_time, *creation_time);
+	}
 	return session;
 
 error:
@@ -236,11 +257,12 @@ static void destroy_session(struct relay_session *session)
 	ret = session_delete(session);
 	assert(!ret);
 	lttng_trace_chunk_put(session->current_trace_chunk);
+	session->current_trace_chunk = NULL;
+	lttng_trace_chunk_put(session->pending_closure_trace_chunk);
+	session->pending_closure_trace_chunk = NULL;
 	ret = sessiond_trace_chunk_registry_session_destroyed(
 			sessiond_trace_chunk_registry, session->sessiond_uuid);
 	assert(!ret);
-	lttng_trace_chunk_put(session->current_trace_chunk);
-	session->current_trace_chunk = NULL;
 	call_rcu(&session->rcu_node, rcu_destroy_session);
 }