X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Frotation-thread.cpp;h=c1c6c50debb4953c0f6c757cf9daa2cee51a9419;hb=c08136a3fab16fd3f620c8bcd93f25ea68382d00;hp=ee924ba98f042ee83a7f80f5d0737c95630d867a;hpb=64803277bbdbe0a943360d918298a48157d9da55;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/rotation-thread.cpp b/src/bin/lttng-sessiond/rotation-thread.cpp
index ee924ba98..c1c6c50de 100644
--- a/src/bin/lttng-sessiond/rotation-thread.cpp
+++ b/src/bin/lttng-sessiond/rotation-thread.cpp
@@ -26,6 +26,7 @@
 #include <lttng/rotate-internal.hpp>
 #include <lttng/location-internal.hpp>
 #include <lttng/condition/condition-internal.hpp>
+#include <lttng/notification/notification-internal.hpp>
 
 #include "rotation-thread.hpp"
 #include "lttng-sessiond.hpp"
@@ -47,13 +48,6 @@ struct rotation_thread {
 	struct lttng_poll_event events;
 };
 
-struct rotation_thread_job {
-	enum rotation_thread_job_type type;
-	struct ltt_session *session;
-	/* List member in struct rotation_thread_timer_queue. */
-	struct cds_list_head head;
-};
-
 /*
  * The timer thread enqueues jobs and wakes up the rotation thread.
  * When the rotation thread wakes up, it empties the queue.
@@ -72,6 +66,15 @@ struct rotation_thread_handle {
 	struct lttng_pipe *quit_pipe;
 };
 
+namespace {
+struct rotation_thread_job {
+	enum rotation_thread_job_type type;
+	struct ltt_session *session;
+	/* List member in struct rotation_thread_timer_queue. */
+	struct cds_list_head head;
+};
+} /* namespace */
+
 static
 const char *get_job_type_str(enum rotation_thread_job_type job_type)
 {
@@ -624,8 +627,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;
@@ -635,6 +637,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);
 
@@ -676,6 +682,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) {
@@ -718,8 +731,6 @@ int handle_notification_channel(int fd __attribute__((unused)),
 	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);
@@ -757,10 +768,7 @@ int handle_notification_channel(int fd __attribute__((unused)),
 		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: