Check for pending notification on notification channel activity

[lttng-tools.git] / src / bin / lttng-sessiond / rotation-thread.c

diff --git a/src/bin/lttng-sessiond/rotation-thread.c b/src/bin/lttng-sessiond/rotation-thread.c
index b0869903eaee1dc630370c52b9a1935cb47254a9..e6b9b6a1e72790702a7d96e1412dd3bcadc43662 100644 (file)
--- 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,
@@ -796,7 +810,7 @@ void *thread_rotation(void *data)
                                ret = handle_channel_rotation_pipe(fd,
                                                revents, handle, &state);
                                if (ret) {
-                                       ERR("[rotation-thread] Handle channel rotation pipe");
+                                       ERR("[rotation-thread] Failed to handle channel rotation pipe");
                                        goto error;
                                }
                        } else if (fd == rotate_notification_channel->socket) {