Changeset 23057

Timestamp:

02/11/07 21:21:36 (22 months ago)

Author:

zarzycki@…

Message:

<rdar://problem/4989673> Bug: launchd_core_logic.c:604 (23046):3: j->p == 0

Files:

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

trunk/launchd/src/launchd_core_logic.c

@@ -274 +274 @@
         mode_t mask;
         unsigned int globargv:1, wait4debugger:1, unload_at_exit:1, stall_before_exec:1, only_once:1,
-                     currently_ignored:1, forced_peers_to_demand_mode:1, setnice:1, hopefully_exits_last:1;
+                     currently_ignored:1, forced_peers_to_demand_mode:1, setnice:1, hopefully_exits_last:1, removal_pending:1;
         char label[0];
 };
@@ -600 +600 @@
         struct semaphoreitem *si;
 
-        job_log(j, LOG_DEBUG, "Removed");
+        if (j->p) {
+                job_log(j, LOG_DEBUG, "Removal pended until the job exits.");
+
+                if (!j->removal_pending) {
+                        j->removal_pending = true;
+                        job_stop(j);
+                }
+
+                return;
+        }
 
         if (j->forced_peers_to_demand_mode) {
                 job_set_global_on_demand(j, false);
-        }
-
-        if (!job_assumes(j, j->p == 0)) {
-                job_assumes(j, kill(j->p, SIGKILL) != -1);
-                job_reap(j);
         }
 
@@ -689 +693 @@
                 jobmgr_tickle(j->mgr);
         }
+
+        job_log(j, LOG_DEBUG, "Removed");
 
         free(j);
@@ -2850 +2856 @@
                 }
                 job_log(j, LOG_INFO, "Exited. Was only configured to run once.");
+                return true;
+        } else if (j->removal_pending) {
+                job_log(j, LOG_DEBUG, "Exited while removal was pending.");
                 return true;
         } else if (j->mgr->shutting_down) {