X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Frotation-thread.c;h=e4811bd44bd957e854c8a0be1250632cd1a07854;hb=a7d0c51c52357e361b9834d04d39a40b16edb46f;hp=590b95dd224b0cc0f6e5351b4cd85f147a66d8ac;hpb=61790539c71b0a4ffa1f813b78981551841b91ac;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/rotation-thread.c b/src/bin/lttng-sessiond/rotation-thread.c
index 590b95dd2..e4811bd44 100644
--- a/src/bin/lttng-sessiond/rotation-thread.c
+++ b/src/bin/lttng-sessiond/rotation-thread.c
@@ -26,6 +26,7 @@
 #include <lttng/rotate-internal.h>
 #include <lttng/location-internal.h>
 #include <lttng/condition/condition-internal.h>
+#include <lttng/notification/notification-internal.h>
 
 #include "rotation-thread.h"
 #include "lttng-sessiond.h"
@@ -619,8 +620,7 @@ end:
 }
 
 static
-int handle_condition(const struct lttng_condition *condition,
-		const struct lttng_evaluation *evaluation,
+int handle_condition(const struct lttng_notification *notification,
 		struct notification_thread_handle *notification_thread_handle)
 {
 	int ret = 0;
@@ -630,6 +630,10 @@ int handle_condition(const struct lttng_condition *condition,
 	enum lttng_evaluation_status evaluation_status;
 	uint64_t consumed;
 	struct ltt_session *session;
+	const struct lttng_condition *condition =
+			lttng_notification_get_const_condition(notification);
+	const struct lttng_evaluation *evaluation =
+			lttng_notification_get_const_evaluation(notification);
 
 	condition_type = lttng_condition_get_type(condition);
 
@@ -671,6 +675,13 @@ int handle_condition(const struct lttng_condition *condition,
 	}
 	session_lock(session);
 
+	if (!lttng_trigger_is_equal(session->rotate_trigger,
+			lttng_notification_get_const_trigger(notification))) {
+		/* Notification does not originate from our rotation trigger. */
+		ret = 0;
+		goto end_unlock;
+	}
+
 	ret = unsubscribe_session_consumed_size_rotation(session,
 			notification_thread_handle);
 	if (ret) {
@@ -713,8 +724,6 @@ int handle_notification_channel(int fd,
 	bool notification_pending;
 	struct lttng_notification *notification = NULL;
 	enum lttng_notification_channel_status status;
-	const struct lttng_evaluation *notification_evaluation;
-	const struct lttng_condition *notification_condition;
 
 	status = lttng_notification_channel_has_pending_notification(
 			rotate_notification_channel, &notification_pending);
@@ -752,10 +761,7 @@ int handle_notification_channel(int fd,
 		goto end;
 	}
 
-	notification_condition = lttng_notification_get_condition(notification);
-	notification_evaluation = lttng_notification_get_evaluation(notification);
-
-	ret = handle_condition(notification_condition, notification_evaluation,
+	ret = handle_condition(notification,
 			handle->notification_thread_handle);
 
 end: