Changeset 23593

Timestamp:

2008-04-08 13:37:28 (6 months ago)

Author:

zarzycki@…

Message:

<rdar://problem/5849623> Workaround 5225889 consistently

Location:

trunk/launchd/src

Files:

• launchd_core_logic.c (modified) (2 diffs)
• launchd_runtime.c (modified) (1 diff)

trunk/launchd/src/launchd_core_logic.c

@@ -3448 +3448 @@
         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];
@@ -5868 +5865 @@
                         if (j->start_interval == 0) {
                                 runtime_add_weak_ref();
-                        } else {
-                                /* Workaround 5225889 */
-                                job_assumes(j, kevent_mod((uintptr_t)&j->start_interval, EVFILT_TIMER, EV_DELETE, 0, 0, j) != -1);
                         }
                         j->start_interval = inval;

trunk/launchd/src/launchd_runtime.c

@@ -841 +841 @@
         case EVFILT_WRITE:
                 break;
+        case EVFILT_TIMER:
+                /* Workaround 5225889 */
+                if (flags & EV_ADD) {
+                        kevent_mod(ident, EVFILT_TIMER, EV_DELETE, 0, 0, NULL);
+                }
+                /* fall through */
         default:
                 flags |= EV_CLEAR;