From: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Date: Wed, 10 Jan 2018 21:23:45 +0000 (-0500)
Subject: Check for pending notification on notification channel activity
X-Git-Tag: v2.11.0-rc1~309
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=d73ee93f00ad2bf67dc79f2e3e09f74e2fb3d01f;p=lttng-tools.git

Check for pending notification on notification channel activity

Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
---

diff --git a/src/bin/lttng-sessiond/rotation-thread.c b/src/bin/lttng-sessiond/rotation-thread.c
index 2fed39fc7..e6b9b6a1e 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,