[launchd-changes] [23395] trunk/launchd/src/launchd_core_logic.c

[source_changes at macosforge.org]

Revision: 23395
          http://trac.macosforge.org/projects/launchd/changeset/23395
Author:   zarzycki at apple.com
Date:     2007-09-17 12:41:22 -0700 (Mon, 17 Sep 2007)

Log Message:
-----------
More fallout from:

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

Modified Paths:
--------------
    trunk/launchd/src/launchd_core_logic.c

Modified: trunk/launchd/src/launchd_core_logic.c
===================================================================
--- trunk/launchd/src/launchd_core_logic.c	2007-09-17 17:27:38 UTC (rev 23394)
+++ trunk/launchd/src/launchd_core_logic.c	2007-09-17 19:41:22 UTC (rev 23395)
@@ -523,7 +523,7 @@
 		return;
 	}
 
-	job_assumes(j, killpg(j->p, SIGTERM) != -1);
+	job_assumes(j, kill(j->p, SIGTERM) != -1);
 	j->sent_sigterm_time = mach_absolute_time();
 
 	if (j->exit_timeout) {
@@ -1955,12 +1955,24 @@
 	if (j->anonymous) {
 		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.");
+	} 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);
 
-		status = W_EXITCODE(0, SIGSEGV);
+		if (!job_assumes(j, wait4(j->p, &status, 0, &ru) != -1)) {
+			job_log(j, LOG_NOTICE, "Working around 5020256. Assuming the job crashed.");
 
-		memset(&ru, 0, sizeof(ru));
+			status = W_EXITCODE(0, SIGSEGV);
+			memset(&ru, 0, sizeof(ru));
+		}
 	}
 
 	if (j->exit_timeout) {
@@ -2147,7 +2159,7 @@
 		return;
 	}
 
-	job_assumes(j, killpg(j->p, SIGKILL) != -1);
+	job_assumes(j, kill(j->p, SIGKILL) != -1);
 
 	j->sent_sigkill = true;
 

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/launchd-changes/attachments/20070917/bc6e77f5/attachment.html