X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fsession.c;h=6e187f2ff51df9c17fb162f0096e7e6a92d7a372;hb=d48d65e152d4a6218f6b3415486f502169bf1949;hp=20edd47e4c707a109b350795c0eb1d725406b7bf;hpb=348a81dcf7b6944b10a813d93dcaf86fdb5194f6;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/session.c b/src/bin/lttng-sessiond/session.c
index 20edd47e4..6e187f2ff 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;
@@ -564,9 +565,12 @@ error:
 	goto end_no_move;
 }
 
-static
-bool output_supports_trace_chunks(const struct consumer_output *output)
+bool session_output_supports_trace_chunks(const struct ltt_session *session)
 {
+	const struct consumer_output *output = session->kernel_session ?
+			session->kernel_session->consumer :
+			session->ust_session->consumer;
+
 	if (output->type == CONSUMER_DST_LOCAL) {
 		return true;
 	} else {
@@ -619,9 +623,6 @@ struct lttng_trace_chunk *session_create_new_trace_chunk(
 		goto error;
 	}
 
-	if (!output_supports_trace_chunks(output)) {
-		goto end;
-	}
 	next_chunk_id = session->most_recent_chunk_id.is_set ?
 			session->most_recent_chunk_id.value + 1 : 0;
 
@@ -715,12 +716,15 @@ int session_close_trace_chunk(const struct ltt_session *session,
 	}
 
 	if (session->ust_session) {
+		const uint64_t relayd_id =
+				session->ust_session->consumer->net_seq_index;
+
 		cds_lfht_for_each_entry(
 				session->ust_session->consumer->socks->ht,
 				&iter, socket, node.node) {
 			pthread_mutex_lock(socket->lock);
 			ret = consumer_close_trace_chunk(socket,
-					session->consumer->net_seq_index,
+					relayd_id,
 					session->id,
 					trace_chunk);
 			pthread_mutex_unlock(socket->lock);
@@ -731,12 +735,15 @@ int session_close_trace_chunk(const struct ltt_session *session,
 		}
 	}
 	if (session->kernel_session) {
+		const uint64_t relayd_id =
+				session->kernel_session->consumer->net_seq_index;
+
 		cds_lfht_for_each_entry(
 				session->kernel_session->consumer->socks->ht,
 				&iter, socket, node.node) {
 			pthread_mutex_lock(socket->lock);
 			ret = consumer_close_trace_chunk(socket,
-					session->consumer->net_seq_index,
+					relayd_id,
 					session->id,
 					trace_chunk);
 			pthread_mutex_unlock(socket->lock);
@@ -788,27 +795,13 @@ 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 */
 	kernel_destroy_session(ksess);
 	session->kernel_session = NULL;
@@ -845,14 +838,22 @@ 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);
+	lttng_dynamic_array_reset(&session->destroy_notifiers);
 	free(session->last_archived_chunk_name);
 	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);
+	}
 }
 
 /*