<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[23395] trunk/launchd/src/launchd_core_logic.c</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.macosforge.org/projects/launchd/changeset/23395">23395</a></dd>
<dt>Author</dt> <dd>zarzycki@apple.com</dd>
<dt>Date</dt> <dd>2007-09-17 12:41:22 -0700 (Mon, 17 Sep 2007)</dd>
</dl>
<h3>Log Message</h3>
<pre>More fallout from:
<rdar://problem/5402927> Bug: launchd_core_logic.c:523 (23327):1: kill(j->p, SIGTERM) != -1</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunklaunchdsrclaunchd_core_logicc">trunk/launchd/src/launchd_core_logic.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunklaunchdsrclaunchd_core_logicc"></a>
<div class="modfile"><h4>Modified: trunk/launchd/src/launchd_core_logic.c (23394 => 23395)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -523,7 +523,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- job_assumes(j, killpg(j->p, SIGTERM) != -1);
</del><ins>+ job_assumes(j, kill(j->p, SIGTERM) != -1);
</ins><span class="cx"> j->sent_sigterm_time = mach_absolute_time();
</span><span class="cx">
</span><span class="cx"> if (j->exit_timeout) {
</span><span class="lines">@@ -1955,12 +1955,24 @@
</span><span class="cx"> if (j->anonymous) {
</span><span class="cx"> status = 0;
</span><span class="cx"> memset(&ru, 0, sizeof(ru));
</span><del>- } else if (!job_assumes(j, wait4(j->p, &status, 0, &ru) != -1)) {
- job_log(j, LOG_NOTICE, "Working around 5020256. Assuming the job crashed.");
</del><ins>+ } 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);
</ins><span class="cx">
</span><del>- status = W_EXITCODE(0, SIGSEGV);
</del><ins>+ if (!job_assumes(j, wait4(j->p, &status, 0, &ru) != -1)) {
+ job_log(j, LOG_NOTICE, "Working around 5020256. Assuming the job crashed.");
</ins><span class="cx">
</span><del>- memset(&ru, 0, sizeof(ru));
</del><ins>+ status = W_EXITCODE(0, SIGSEGV);
+ memset(&ru, 0, sizeof(ru));
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (j->exit_timeout) {
</span><span class="lines">@@ -2147,7 +2159,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- job_assumes(j, killpg(j->p, SIGKILL) != -1);
</del><ins>+ job_assumes(j, kill(j->p, SIGKILL) != -1);
</ins><span class="cx">
</span><span class="cx"> j->sent_sigkill = true;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>