Rename rotate_count to current_archive_id

[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 2fed39fc75a5051fb1b72d006ac95db528075ad8..dcae248b4088c5aa068b871afbc37871176f532b 100644 (file)
--- a/src/bin/lttng-sessiond/rotation-thread.c
+++ b/src/bin/lttng-sessiond/rotation-thread.c
@@ -433,7 +433,7 @@ int rotate_pending_relay_timer(struct ltt_session *session)
 
        DBG("[rotation-thread] Check rotate pending on session %" PRIu64,
                        session->id);
-       ret = relay_rotate_pending(session, session->rotate_count - 1);
+       ret = relay_rotate_pending(session, session->current_archive_id - 1);
        if (ret < 0) {
                ERR("[rotation-thread] Check relay rotate pending");
                goto end;
@@ -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;
 }