<!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>[23057] 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/23057">23057</a></dd>
<dt>Author</dt> <dd>zarzycki@apple.com</dd>
<dt>Date</dt> <dd>2007-02-11 21:21:36 -0800 (Sun, 11 Feb 2007)</dd>
</dl>
<h3>Log Message</h3>
<pre><rdar://problem/4989673> Bug: launchd_core_logic.c:604 (23046):3: j->p == 0</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 (23056 => 23057)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/launchd/src/launchd_core_logic.c 2007-02-12 05:08:01 UTC (rev 23056)
+++ trunk/launchd/src/launchd_core_logic.c 2007-02-12 05:21:36 UTC (rev 23057)
</span><span class="lines">@@ -273,7 +273,7 @@
</span><span class="cx"> importing_global_env:1, importing_hard_limits:1, setmask:1, legacy_mach_job:1, runatload:1;
</span><span class="cx"> mode_t mask;
</span><span class="cx"> unsigned int globargv:1, wait4debugger:1, unload_at_exit:1, stall_before_exec:1, only_once:1,
</span><del>- currently_ignored:1, forced_peers_to_demand_mode:1, setnice:1, hopefully_exits_last:1;
</del><ins>+ currently_ignored:1, forced_peers_to_demand_mode:1, setnice:1, hopefully_exits_last:1, removal_pending:1;
</ins><span class="cx"> char label[0];
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -599,17 +599,21 @@
</span><span class="cx"> struct machservice *ms;
</span><span class="cx"> struct semaphoreitem *si;
</span><span class="cx">
</span><del>- job_log(j, LOG_DEBUG, "Removed");
</del><ins>+ if (j->p) {
+ job_log(j, LOG_DEBUG, "Removal pended until the job exits.");
</ins><span class="cx">
</span><ins>+ if (!j->removal_pending) {
+ j->removal_pending = true;
+ job_stop(j);
+ }
+
+ return;
+ }
+
</ins><span class="cx"> if (j->forced_peers_to_demand_mode) {
</span><span class="cx"> job_set_global_on_demand(j, false);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (!job_assumes(j, j->p == 0)) {
- job_assumes(j, kill(j->p, SIGKILL) != -1);
- job_reap(j);
- }
-
</del><span class="cx"> if (!job_assumes(j, j->forkfd == 0)) {
</span><span class="cx"> job_assumes(j, close(j->forkfd) != -1);
</span><span class="cx"> }
</span><span class="lines">@@ -689,6 +693,8 @@
</span><span class="cx"> jobmgr_tickle(j->mgr);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ job_log(j, LOG_DEBUG, "Removed");
+
</ins><span class="cx"> free(j);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2850,6 +2856,9 @@
</span><span class="cx"> }
</span><span class="cx"> job_log(j, LOG_INFO, "Exited. Was only configured to run once.");
</span><span class="cx"> return true;
</span><ins>+ } else if (j->removal_pending) {
+ job_log(j, LOG_DEBUG, "Exited while removal was pending.");
+ return true;
</ins><span class="cx"> } else if (j->mgr->shutting_down) {
</span><span class="cx"> job_log(j, LOG_NOTICE, "Exited while shutdown in progress. Processes remaining: %u", total_children);
</span><span class="cx"> return true;
</span></span></pre>
</div>
</div>
</body>
</html>