Changeset 23276

Timestamp:

06/08/07 14:11:59 (18 months ago)

Author:

zarzycki@…

Message:

Small bug fixes.

Files:

• trunk/launchd/src/launchd_core_logic.c (modified) (5 diffs)

trunk/launchd/src/launchd_core_logic.c

@@ -2728 +2728 @@
 calendarinterval_setalarm(job_t j, struct calendarinterval *ci)
 {
-        static time_t last_list_head_when;
         struct calendarinterval *ci_iter, *ci_prev = NULL;
-        time_t later;
+        time_t later, head_later;
 
         later = cronemu(ci->when.tm_mon, ci->when.tm_mday, ci->when.tm_hour, ci->when.tm_min);
@@ -2765 +2764 @@
         }
 
-        if (last_list_head_when == LIST_FIRST(&sorted_calendar_events)->when_next) {
-                return;
-        }
-
-        last_list_head_when = LIST_FIRST(&sorted_calendar_events)->when_next;
-
-        if (job_assumes(j, kevent_mod((uintptr_t)&sorted_calendar_events, EVFILT_TIMER, EV_ADD, NOTE_ABSOLUTE|NOTE_SECONDS, last_list_head_when, root_jobmgr) != -1)) {
+        head_later = LIST_FIRST(&sorted_calendar_events)->when_next;
+
+        /* Workaround 5225889 */
+        kevent_mod((uintptr_t)&sorted_calendar_events, EVFILT_TIMER, EV_DELETE, 0, 0, root_jobmgr);
+
+        if (job_assumes(j, kevent_mod((uintptr_t)&sorted_calendar_events, EVFILT_TIMER, EV_ADD, NOTE_ABSOLUTE|NOTE_SECONDS, head_later, root_jobmgr) != -1)) {
                 char time_string[100];
                 size_t time_string_len;
@@ -3157 +3155 @@
         time_t now = time(NULL);
 
-        if (ci && ci->when_next < now) {
+        if (ci && (ci->when_next < now)) {
                 jobmgr_assumes(root_jobmgr, kill(getpid(), SIGUSR1) != -1);
         }
@@ -3171 +3169 @@
                 job_t j = ci->job;
 
-                if (ci->when_next >= now) {
+                if (ci->when_next > now) {
                         break;
                 }
@@ -3454 +3452 @@
         }
 
-        if (j->start_pending && j->start_time == 0) {
-                job_log(j, LOG_DEBUG, "KeepAlive check: job needs to run at least once.");
+        if (j->start_pending) {
+                job_log(j, LOG_DEBUG, "KeepAlive check: Pent-up non-IPC launch criteria.");
                 return true;
         }