X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Frotation-thread.c;h=d39aad80b413e888a9d6859a5be17473e7b11e0f;hb=cea6c68e33a159a83b52d0931d355051d89283a2;hp=2fed39fc75a5051fb1b72d006ac95db528075ad8;hpb=50eba12b374614643f2e16f5c1f07622d3c4e4ac;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/rotation-thread.c b/src/bin/lttng-sessiond/rotation-thread.c
index 2fed39fc7..d39aad80b 100644
--- a/src/bin/lttng-sessiond/rotation-thread.c
+++ b/src/bin/lttng-sessiond/rotation-thread.c
@@ -682,11 +682,25 @@ int handle_notification_channel(int fd, uint32_t revents,
 		struct rotation_thread_state *state)
 {
 	int ret;
-	struct lttng_notification *notification;
+	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);
+	if (status != LTTNG_NOTIFICATION_CHANNEL_STATUS_OK) {
+		ERR("[rotation-thread ]Error occured while checking for pending notification");
+		ret = -1;
+		goto end;
+	}
+
+	if (!notification_pending) {
+		ret = 0;
+		goto end;
+	}
+
 	/* Receive the next notification. */
 	status = lttng_notification_channel_get_next_notification(
 			rotate_notification_channel,
@@ -718,11 +732,6 @@ int handle_notification_channel(int fd, uint32_t revents,
 
 end:
 	lttng_notification_destroy(notification);
-	if (ret != 0) {
-		goto end;
-	}
-
-
 	return ret;
 }