Changeset 23368

Timestamp:

09/10/07 13:43:52 (15 months ago)

Author:

zarzycki@…

Message:

We only need/want the "Still alive" check if launchd has been idle for a while...

Files:

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

trunk/launchd/src/launchd_core_logic.c

@@ -640 +640 @@
 }
 
+static void
+still_alive_with_check(void)
+{
+        jobmgr_log(root_jobmgr, LOG_NOTICE, "Still alive with %u children.", total_children);
+
+        runtime_closelog(); /* hack to flush logs */
+}
+
 jobmgr_t
 jobmgr_shutdown(jobmgr_t jm)
@@ -663 +671 @@
 
         if (debug_shutdown_hangs && jm->parentmgr == NULL && getpid() == 1) {
-                jobmgr_assumes(jm, kevent_mod((uintptr_t)jm, EVFILT_TIMER, EV_ADD, NOTE_SECONDS, 3, jm) != -1);
+                runtime_set_timeout(still_alive_with_check, 3000);
         }
 
@@ -2242 +2250 @@
                 break;
         case EVFILT_TIMER:
-                if (kev->ident == (uintptr_t)&sorted_calendar_events) {
+                if (jobmgr_assumes(jm, kev->ident == (uintptr_t)&sorted_calendar_events)) {
                         calendarinterval_callback();
-                } else {
-                        jobmgr_log(jm, LOG_NOTICE, "Still alive with %u children.", total_children);
-                        runtime_closelog(); /* hack to flush logs */
                 }
                 break;