X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fsession.c;h=2a7b8b83bb8d643ecdfcfdbd3c1364e69b562b10;hp=09953b48218d6b592d4f8e1ad4d69ef0461ab3d7;hb=6fa5fe7cc78bea0b0bba154a0f911d3df530e18f;hpb=0a184d4ea76d365036939e7b0c295df0610f80d3

diff --git a/src/bin/lttng-sessiond/session.c b/src/bin/lttng-sessiond/session.c
index 09953b482..2a7b8b83b 100644
--- a/src/bin/lttng-sessiond/session.c
+++ b/src/bin/lttng-sessiond/session.c
@@ -39,6 +39,7 @@
 #include "utils.h"
 #include "trace-ust.h"
 #include "timer.h"
+#include "cmd.h"
 
 struct ltt_session_destroy_notifier_element {
 	ltt_session_destroy_notifier notifier;
@@ -794,32 +795,17 @@ void session_release(struct urcu_ref *ref)
 	struct ltt_ust_session *usess;
 	struct ltt_kernel_session *ksess;
 	struct ltt_session *session = container_of(ref, typeof(*session), ref);
+	const bool session_published = session->published;
 
 	assert(!session->chunk_being_archived);
 
 	usess = session->ust_session;
 	ksess = session->kernel_session;
 
-	session_notify_destruction(session);
-	lttng_dynamic_array_reset(&session->destroy_notifiers);
-	if (session->current_trace_chunk) {
-		ret = session_close_trace_chunk(session, session->current_trace_chunk, NULL);
-		if (ret) {
-			ERR("Failed to close the current trace chunk of session \"%s\" during its release",
-					session->name);
-		}
-		ret = _session_set_trace_chunk_no_lock_check(session, NULL, NULL);
-		if (ret) {
-			ERR("Failed to release the current trace chunk of session \"%s\" during its release",
-					session->name);
-		}
-        }
-
-        /* Clean kernel session teardown */
+        /* Clean kernel session teardown, keeping data for destroy notifier. */
 	kernel_destroy_session(ksess);
-	session->kernel_session = NULL;
 
-	/* UST session teardown */
+	/* UST session teardown, keeping data for destroy notifier. */
 	if (usess) {
 		/* Close any relayd session */
 		consumer_output_send_destroy_relayd(usess->consumer);
@@ -830,9 +816,8 @@ void session_release(struct urcu_ref *ref)
 			ERR("Error in ust_app_destroy_trace_all");
 		}
 
-		/* Clean up the rest. */
+		/* Clean up the rest, keeping destroy notifier data. */
 		trace_ust_destroy_session(usess);
-		session->ust_session = NULL;
 	}
 
 	/*
@@ -851,14 +836,30 @@ void session_release(struct urcu_ref *ref)
 
 	pthread_mutex_destroy(&session->lock);
 
-	if (session->published) {
+	if (session_published) {
 		ASSERT_LOCKED(ltt_session_list.lock);
 		del_session_list(session);
 		del_session_ht(session);
-		pthread_cond_broadcast(&ltt_session_list.removal_cond);
 	}
+	session_notify_destruction(session);
+
+	kernel_free_session(ksess);
+	session->kernel_session = NULL;
+	if (usess) {
+		trace_ust_free_session(usess);
+		session->ust_session = NULL;
+	}
+	lttng_dynamic_array_reset(&session->destroy_notifiers);
 	free(session->last_archived_chunk_name);
+	free(session->base_path);
 	free(session);
+	if (session_published) {
+		/*
+		 * Broadcast after free-ing to ensure the memory is
+		 * reclaimed before the main thread exits.
+		 */
+		pthread_cond_broadcast(&ltt_session_list.removal_cond);
+	}
 }
 
 /*
@@ -981,7 +982,7 @@ end:
  * Session list lock must be held by the caller.
  */
 enum lttng_error_code session_create(const char *name, uid_t uid, gid_t gid,
-		struct ltt_session **out_session)
+		const char *base_path, struct ltt_session **out_session)
 {
 	int ret;
 	enum lttng_error_code ret_code;
@@ -1104,6 +1105,16 @@ enum lttng_error_code session_create(const char *name, uid_t uid, gid_t gid,
 		}
 	}
 
+	if (base_path) {
+		new_session->base_path = strdup(base_path);
+		if (!new_session->base_path) {
+			ERR("Failed to allocate base path of session \"%s\"",
+					name);
+			ret_code = LTTNG_ERR_SESSION_FAIL;
+			goto error;
+		}
+	}
+
 	new_session->uid = uid;
 	new_session->gid = gid;