<!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>[23122] 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/23122">23122</a></dd>
<dt>Author</dt> <dd>zarzycki@apple.com</dd>
<dt>Date</dt> <dd>2007-03-01 20:04:37 -0800 (Thu, 01 Mar 2007)</dd>
</dl>
<h3>Log Message</h3>
<pre><rdar://problem/5034268> Work around 5020256</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 (23121 => 23122)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/launchd/src/launchd_core_logic.c 2007-03-01 19:19:11 UTC (rev 23121)
+++ trunk/launchd/src/launchd_core_logic.c 2007-03-02 04:04:37 UTC (rev 23122)
</span><span class="lines">@@ -303,7 +303,7 @@
</span><span class="cx"> static void job_force_sampletool(job_t j);
</span><span class="cx"> static void job_reparent_hack(job_t j, const char *where);
</span><span class="cx"> static void job_callback(void *obj, struct kevent *kev);
</span><del>-static void job_callback_proc(job_t j, int fflags);
</del><ins>+static void job_callback_proc(job_t j, int flags, int fflags);
</ins><span class="cx"> static void job_callback_timer(job_t j, void *ident);
</span><span class="cx"> static void job_callback_read(job_t j, int ident);
</span><span class="cx"> static launch_data_t job_export2(job_t j, bool subjobs);
</span><span class="lines">@@ -1661,7 +1661,16 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!job_assumes(j, wait4(j->p, &status, 0, &ru) != -1)) {
</span><del>- return;
</del><ins>+ /*
+ * wait4() then kill() is still racy.
+ * Then again, we never should have got here in the first place...
+ */
+ if (kill(j->p, 0) == 0) {
+ job_log(j, LOG_DEBUG, "Working around 5020256");
+ }
+
+ status = 0;
+ 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">@@ -1817,7 +1826,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void
</span><del>-job_callback_proc(job_t j, int fflags)
</del><ins>+job_callback_proc(job_t j, int flags, int fflags)
</ins><span class="cx"> {
</span><span class="cx"> if (fflags & NOTE_EXEC) {
</span><span class="cx"> job_log(j, LOG_DEBUG, "Called execve()");
</span><span class="lines">@@ -1828,6 +1837,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (fflags & NOTE_EXIT) {
</span><ins>+ job_assumes(j, (flags & EV_ONESHOT));
+ job_assumes(j, (flags & EV_EOF));
</ins><span class="cx"> job_reap(j);
</span><span class="cx"> job_dispatch(j, false);
</span><span class="cx">
</span><span class="lines">@@ -1904,7 +1915,7 @@
</span><span class="cx">
</span><span class="cx"> switch (kev->filter) {
</span><span class="cx"> case EVFILT_PROC:
</span><del>- return job_callback_proc(j, kev->fflags);
</del><ins>+ return job_callback_proc(j, kev->flags, kev->fflags);
</ins><span class="cx"> case EVFILT_TIMER:
</span><span class="cx"> return job_callback_timer(j, (void *)kev->ident);
</span><span class="cx"> case EVFILT_VNODE:
</span></span></pre>
</div>
</div>
</body>
</html>