Changeset 23395

Timestamp:

09/17/07 12:41:22 (15 months ago)

Author:

zarzycki@…

Message:

More fallout from:

<rdar://problem/5402927> Bug: launchd_core_logic.c:523 (23327):1: kill(j->p, SIGTERM) != -1

Files:

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

trunk/launchd/src/launchd_core_logic.c

@@ -524 +524 @@
         }
 
-        job_assumes(j, killpg(j->p, SIGTERM) != -1);
+        job_assumes(j, kill(j->p, SIGTERM) != -1);
         j->sent_sigterm_time = mach_absolute_time();
 
@@ -1956 +1956 @@
                 status = 0;
                 memset(&ru, 0, sizeof(ru));
-        } else if (!job_assumes(j, wait4(j->p, &status, 0, &ru) != -1)) {
-                job_log(j, LOG_NOTICE, "Working around 5020256. Assuming the job crashed.");
-
-                status = W_EXITCODE(0, SIGSEGV);
-
-                memset(&ru, 0, sizeof(ru));
+        } else {
+                /*
+                 * The job is dead. While the PID/PGID is still known to be
+                 * valid, try to kill abandoned descendant processes.
+                 *
+                 * We'd use job_assumes(), but POSIX defines consistency over
+                 * correctness, and consequently kill/killpg now returns EPERM
+                 * instead of ESRCH. As luck would have it, ESRCH is the only
+                 * error we can ignore.
+                 */
+                killpg(j->p, SIGKILL);
+
+                if (!job_assumes(j, wait4(j->p, &status, 0, &ru) != -1)) {
+                        job_log(j, LOG_NOTICE, "Working around 5020256. Assuming the job crashed.");
+
+                        status = W_EXITCODE(0, SIGSEGV);
+                        memset(&ru, 0, sizeof(ru));
+                }
         }
 
@@ -2148 +2160 @@
         }
 
-        job_assumes(j, killpg(j->p, SIGKILL) != -1);
+        job_assumes(j, kill(j->p, SIGKILL) != -1);
 
         j->sent_sigkill = true;