X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Frotate.cpp;fp=src%2Fbin%2Flttng-sessiond%2Frotate.cpp;h=d1be8f686d3fc20a04aa23779bada0eef3082a4c;hp=51fc5e8aad81a6e94f73bdb5984beaaea45f4412;hb=c08136a3fab16fd3f620c8bcd93f25ea68382d00;hpb=281a10509e36529edb8733a28367122531a63e21

diff --git a/src/bin/lttng-sessiond/rotate.cpp b/src/bin/lttng-sessiond/rotate.cpp
index 51fc5e8aa..d1be8f686 100644
--- a/src/bin/lttng-sessiond/rotate.cpp
+++ b/src/bin/lttng-sessiond/rotate.cpp
@@ -25,6 +25,8 @@
 
 #include <lttng/notification/channel-internal.hpp>
 #include <lttng/rotate-internal.hpp>
+#include <lttng/condition/condition-internal.hpp>
+#include <lttng/action/action-internal.hpp>
 
 #include "session.hpp"
 #include "rotate.hpp"
@@ -45,21 +47,22 @@ int subscribe_session_consumed_size_rotation(struct ltt_session *session, uint64
 	int ret;
 	enum lttng_condition_status condition_status;
 	enum lttng_notification_channel_status nc_status;
-	struct lttng_action *action;
+	struct lttng_condition *rotate_condition = nullptr;
+	struct lttng_action *notify_action = nullptr;
 	const struct lttng_credentials session_creds = {
 		.uid = LTTNG_OPTIONAL_INIT_VALUE(session->uid),
 		.gid = LTTNG_OPTIONAL_INIT_VALUE(session->gid),
 	};
 
-	session->rotate_condition = lttng_condition_session_consumed_size_create();
-	if (!session->rotate_condition) {
+	rotate_condition = lttng_condition_session_consumed_size_create();
+	if (!rotate_condition) {
 		ERR("Failed to create session consumed size condition object");
 		ret = -1;
 		goto end;
 	}
 
 	condition_status = lttng_condition_session_consumed_size_set_threshold(
-			session->rotate_condition, size);
+			rotate_condition, size);
 	if (condition_status != LTTNG_CONDITION_STATUS_OK) {
 		ERR("Could not set session consumed size condition threshold (size = %" PRIu64 ")",
 				size);
@@ -69,7 +72,7 @@ int subscribe_session_consumed_size_rotation(struct ltt_session *session, uint64
 
 	condition_status =
 			lttng_condition_session_consumed_size_set_session_name(
-				session->rotate_condition, session->name);
+				rotate_condition, session->name);
 	if (condition_status != LTTNG_CONDITION_STATUS_OK) {
 		ERR("Could not set session consumed size condition session name (name = %s)",
 				session->name);
@@ -77,15 +80,16 @@ int subscribe_session_consumed_size_rotation(struct ltt_session *session, uint64
 		goto end;
 	}
 
-	action = lttng_action_notify_create();
-	if (!action) {
+	notify_action = lttng_action_notify_create();
+	if (!notify_action) {
 		ERR("Could not create notify action");
 		ret = -1;
 		goto end;
 	}
 
-	session->rotate_trigger = lttng_trigger_create(session->rotate_condition,
-			action);
+	LTTNG_ASSERT(!session->rotate_trigger);
+	session->rotate_trigger = lttng_trigger_create(rotate_condition,
+			notify_action);
 	if (!session->rotate_trigger) {
 		ERR("Could not create size-based rotation trigger");
 		ret = -1;
@@ -98,7 +102,7 @@ int subscribe_session_consumed_size_rotation(struct ltt_session *session, uint64
 			session->rotate_trigger, &session_creds);
 
 	nc_status = lttng_notification_channel_subscribe(
-			rotate_notification_channel, session->rotate_condition);
+			rotate_notification_channel, rotate_condition);
 	if (nc_status != LTTNG_NOTIFICATION_CHANNEL_STATUS_OK) {
 		ERR("Could not subscribe to session consumed size notification");
 		ret = -1;
@@ -117,6 +121,11 @@ int subscribe_session_consumed_size_rotation(struct ltt_session *session, uint64
 	ret = 0;
 
 end:
+	lttng_condition_put(rotate_condition);
+	lttng_action_put(notify_action);
+	if (ret) {
+		lttng_trigger_put(session->rotate_trigger);
+	}
 	return ret;
 }
 
@@ -126,9 +135,10 @@ int unsubscribe_session_consumed_size_rotation(struct ltt_session *session,
 	int ret = 0;
 	enum lttng_notification_channel_status status;
 
+	LTTNG_ASSERT(session->rotate_trigger);
 	status = lttng_notification_channel_unsubscribe(
 			rotate_notification_channel,
-			session->rotate_condition);
+			lttng_trigger_get_const_condition(session->rotate_trigger));
 	if (status != LTTNG_NOTIFICATION_CHANNEL_STATUS_OK) {
 		ERR("Session unsubscribe error: %d", (int) status);
 		ret = -1;
@@ -142,6 +152,9 @@ int unsubscribe_session_consumed_size_rotation(struct ltt_session *session,
 		goto end;
 	}
 
+	lttng_trigger_put(session->rotate_trigger);
+	session->rotate_trigger = nullptr;
+
 	ret = 0;
 end:
 	return ret;