Changeset 23585

Timestamp:

04/02/08 13:18:49 (8 months ago)

Author:

zarzycki@…

Message:

<rdar://problem/5835375> 10.5.3 Regression: Failure to shutdown in 9D11 with zombie shutdown

Files:

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

branches/SULeopard/launchd/src/launchd_core_logic.c

@@ -3885 +3885 @@
                 job_log(j, LOG_DEBUG, "Exited while removal was pending.");
                 return true;
-        } else if (j->mgr->shutting_down && j->mgr->hopefully_first_cnt == 0) {
+        } else if (j->mgr->shutting_down && (j->hopefully_exits_first || j->mgr->hopefully_first_cnt == 0)) {
                 job_log(j, LOG_DEBUG, "Exited while shutdown in progress. Processes remaining: %lu/%lu", total_children, total_anon_children);
                 return true;
@@ -3911 +3911 @@
         bool good_exit = (WIFEXITED(j->last_exit_status) && WEXITSTATUS(j->last_exit_status) == 0);
 
+        if (j->mgr->shutting_down) {
+                return false;
+        }
+
         /*
          * 5066316
@@ -3917 +3921 @@
          * launchctl.c for the other half of this hack.
          */
-        if ((j->mgr->shutting_down || j->mgr->global_on_demand_cnt > 0) && strcmp(j->label, "com.apple.kextd") != 0) {
+        if (j->mgr->global_on_demand_cnt > 0 && strcmp(j->label, "com.apple.kextd") != 0) {
                 return false;
         }