<!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>[23042] trunk/launchd/src</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.macosforge.org/projects/launchd/changeset/23042">23042</a></dd>
<dt>Author</dt> <dd>zarzycki@apple.com</dd>
<dt>Date</dt> <dd>2007-02-08 07:21:26 -0800 (Thu, 08 Feb 2007)</dd>
</dl>
<h3>Log Message</h3>
<pre><rdar://problem/4943031> Add plist option to mimic the kernel's KERN_PROCDELAYTERM</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunklaunchdsrclaunchdc">trunk/launchd/src/launchd.c</a></li>
<li><a href="#trunklaunchdsrclaunchdh">trunk/launchd/src/launchd.h</a></li>
<li><a href="#trunklaunchdsrclaunchdplist5">trunk/launchd/src/launchd.plist.5</a></li>
<li><a href="#trunklaunchdsrclaunchd_core_logicc">trunk/launchd/src/launchd_core_logic.c</a></li>
<li><a href="#trunklaunchdsrclaunchd_core_logich">trunk/launchd/src/launchd_core_logic.h</a></li>
<li><a href="#trunklaunchdsrcliblaunch_publich">trunk/launchd/src/liblaunch_public.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunklaunchdsrclaunchdc"></a>
<div class="modfile"><h4>Modified: trunk/launchd/src/launchd.c (23041 => 23042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/launchd/src/launchd.c 2007-02-08 01:28:03 UTC (rev 23041)
+++ trunk/launchd/src/launchd.c 2007-02-08 15:21:26 UTC (rev 23042)
</span><span class="lines">@@ -110,7 +110,7 @@
</span><span class="cx"> static const char *launchctl_bootstrap_tool[] = { "/bin/launchctl", /* "bootstrap", */ NULL };
</span><span class="cx">
</span><span class="cx"> sigset_t blocked_signals = 0;
</span><del>-bool shutdown_in_progress = false;
</del><ins>+static bool shutdown_in_progress = false;
</ins><span class="cx"> bool debug_shutdown_hangs = false;
</span><span class="cx"> bool network_up = false;
</span><span class="cx"> int batch_disabler_count = 0;
</span><span class="lines">@@ -469,7 +469,7 @@
</span><span class="cx">
</span><span class="cx"> rlcj = NULL;
</span><span class="cx">
</span><del>- jobmgr_remove_all_inactive(root_jobmgr);
</del><ins>+ root_jobmgr = jobmgr_shutdown(root_jobmgr);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void
</span><span class="lines">@@ -676,7 +676,7 @@
</span><span class="cx"> void
</span><span class="cx"> launchd_post_kevent(void)
</span><span class="cx"> {
</span><del>- if (shutdown_in_progress && jobmgr_is_idle(root_jobmgr)) {
</del><ins>+ if (shutdown_in_progress && (!root_jobmgr || jobmgr_is_idle(root_jobmgr))) {
</ins><span class="cx"> shutdown_in_progress = false;
</span><span class="cx">
</span><span class="cx"> if (getpid() == 1) {
</span></span></pre></div>
<a id="trunklaunchdsrclaunchdh"></a>
<div class="modfile"><h4>Modified: trunk/launchd/src/launchd.h (23041 => 23042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/launchd/src/launchd.h 2007-02-08 01:28:03 UTC (rev 23041)
+++ trunk/launchd/src/launchd.h 2007-02-08 15:21:26 UTC (rev 23042)
</span><span class="lines">@@ -34,7 +34,6 @@
</span><span class="cx">
</span><span class="cx"> extern kq_callback kqsimple_zombie_reaper;
</span><span class="cx"> extern sigset_t blocked_signals;
</span><del>-extern bool shutdown_in_progress;
</del><span class="cx"> extern bool debug_shutdown_hangs;
</span><span class="cx"> extern bool network_up;
</span><span class="cx"> extern int batch_disabler_count;
</span></span></pre></div>
<a id="trunklaunchdsrclaunchdplist5"></a>
<div class="modfile"><h4>Modified: trunk/launchd/src/launchd.plist.5 (23041 => 23042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/launchd/src/launchd.plist.5 2007-02-08 01:28:03 UTC (rev 23041)
+++ trunk/launchd/src/launchd.plist.5 2007-02-08 15:21:26 UTC (rev 23042)
</span><span class="lines">@@ -271,6 +271,12 @@
</span><span class="cx"> This optional key specifies what
</span><span class="cx"> .Xr nice 3
</span><span class="cx"> value should be applied to the daemon.
</span><ins>+.It Sy HopefullyExitsLast <boolean>
+This optional key causes programs to exit in a second wave during system
+shutdown. This key exists because some jobs don't reference count their
+clients, and therefore do not know when it is safe to exit. The use of this key
+should be considered a temporary solution until the software can be changed to
+properly reference count clients.
</ins><span class="cx"> .It Sy LowPriorityIO <boolean>
</span><span class="cx"> This optional key specifies whether the kernel should consider this daemon to be low priority when doing file system I/O.
</span><span class="cx"> .It Sy LaunchOnlyOnce <boolean>
</span></span></pre></div>
<a id="trunklaunchdsrclaunchd_core_logicc"></a>
<div class="modfile"><h4>Modified: trunk/launchd/src/launchd_core_logic.c (23041 => 23042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/launchd/src/launchd_core_logic.c 2007-02-08 01:28:03 UTC (rev 23041)
+++ trunk/launchd/src/launchd_core_logic.c 2007-02-08 15:21:26 UTC (rev 23042)
</span><span class="lines">@@ -199,7 +199,7 @@
</span><span class="cx"> char *jm_stdout;
</span><span class="cx"> char *jm_stderr;
</span><span class="cx"> unsigned int global_on_demand_cnt;
</span><del>- unsigned int transfer_bstrap:1;
</del><ins>+ unsigned int transfer_bstrap:1, sent_stop_to_hopeful_jobs:1, shutting_down:1;
</ins><span class="cx"> char name[0];
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -208,6 +208,7 @@
</span><span class="cx">
</span><span class="cx"> static jobmgr_t jobmgr_new(jobmgr_t jm, mach_port_t requestorport, mach_port_t checkin_port);
</span><span class="cx"> static jobmgr_t jobmgr_parent(jobmgr_t jm);
</span><ins>+static jobmgr_t jobmgr_tickle(jobmgr_t jm);
</ins><span class="cx"> static void jobmgr_dispatch_all(jobmgr_t jm);
</span><span class="cx"> static job_t jobmgr_new_anonymous(jobmgr_t jm);
</span><span class="cx"> static job_t job_mig_intran2(jobmgr_t jm, mach_port_t p);
</span><span class="lines">@@ -268,7 +269,7 @@
</span><span class="cx"> anonymous: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;
</del><ins>+ currently_ignored:1, forced_peers_to_demand_mode:1, setnice:1, hopefully_exits_last:1;
</ins><span class="cx"> char label[0];
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -510,23 +511,27 @@
</span><span class="cx"> return r;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void
-jobmgr_remove_all_inactive(jobmgr_t jm)
</del><ins>+jobmgr_t
+jobmgr_shutdown(jobmgr_t jm)
</ins><span class="cx"> {
</span><span class="cx"> jobmgr_t jmi, jmn;
</span><span class="cx"> job_t ji, jn;
</span><span class="cx">
</span><span class="cx"> SLIST_FOREACH_SAFE(jmi, &jm->submgrs, sle, jmn) {
</span><del>- jobmgr_remove_all_inactive(jmi);
</del><ins>+ jobmgr_shutdown(jmi);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> SLIST_FOREACH_SAFE(ji, &jm->jobs, sle, jn) {
</span><span class="cx"> if (!job_active(ji)) {
</span><span class="cx"> job_remove(ji);
</span><del>- } else {
</del><ins>+ } else if (!ji->hopefully_exits_last) {
</ins><span class="cx"> job_stop(ji);
</span><span class="cx"> }
</span><span class="cx"> }
</span><ins>+
+ jm->shutting_down = true;
+
+ return jobmgr_tickle(jm);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void
</span><span class="lines">@@ -595,10 +600,6 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (job_assumes(j, j->mgr)) {
- SLIST_REMOVE(&j->mgr->jobs, j, job_s, sle);
- }
-
</del><span class="cx"> if (j->forkfd) {
</span><span class="cx"> job_assumes(j, close(j->forkfd) != -1);
</span><span class="cx"> }
</span><span class="lines">@@ -672,6 +673,12 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> kevent_mod((uintptr_t)j, EVFILT_TIMER, EV_DELETE, 0, 0, NULL);
</span><ins>+
+ if (job_assumes(j, j->mgr)) {
+ SLIST_REMOVE(&j->mgr->jobs, j, job_s, sle);
+ jobmgr_tickle(j->mgr);
+ }
+
</ins><span class="cx"> free(j);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -894,7 +901,7 @@
</span><span class="cx"> int i, cc = 0;
</span><span class="cx"> job_t j;
</span><span class="cx">
</span><del>- if (shutdown_in_progress) {
</del><ins>+ if (jm->shutting_down) {
</ins><span class="cx"> errno = EINVAL;
</span><span class="cx"> return NULL;
</span><span class="cx"> }
</span><span class="lines">@@ -1036,6 +1043,12 @@
</span><span class="cx"> j->debug = value;
</span><span class="cx"> }
</span><span class="cx"> break;
</span><ins>+ case 'h':
+ case 'H':
+ if (strcasecmp(key, LAUNCH_JOBKEY_HOPEFULLYEXITSLAST) == 0) {
+ j->hopefully_exits_last = value;
+ }
+ break;
</ins><span class="cx"> case 's':
</span><span class="cx"> case 'S':
</span><span class="cx"> if (strcasecmp(key, LAUNCH_JOBKEY_SESSIONCREATE) == 0) {
</span><span class="lines">@@ -2805,7 +2818,7 @@
</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><del>- } else if (shutdown_in_progress) {
</del><ins>+ } else if (j->mgr->shutting_down) {
</ins><span class="cx"> job_log(j, LOG_INFO, "Exited while shutdown in progress.");
</span><span class="cx"> return true;
</span><span class="cx"> } else if (!j->checkedin && (!SLIST_EMPTY(&j->sockets) || !SLIST_EMPTY(&j->machservices))) {
</span><span class="lines">@@ -3162,6 +3175,35 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+jobmgr_t
+jobmgr_tickle(jobmgr_t jm)
+{
+ job_t ji;
+
+ if (jm->sent_stop_to_hopeful_jobs || !jm->shutting_down) {
+ return jm;
+ }
+
+ SLIST_FOREACH(ji, &jm->jobs, sle) {
+ if (ji->p && !ji->hopefully_exits_last) {
+ return jm;
+ }
+ }
+
+ SLIST_FOREACH(ji, &jm->jobs, sle) {
+ job_stop(ji);
+ }
+
+ jm->sent_stop_to_hopeful_jobs = true;
+
+ if (jobmgr_is_idle(jm)) {
+ jobmgr_remove(jm);
+ return NULL;
+ }
+
+ return jm;
+}
+
</ins><span class="cx"> bool
</span><span class="cx"> jobmgr_is_idle(jobmgr_t jm)
</span><span class="cx"> {
</span><span class="lines">@@ -3321,11 +3363,7 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> if (jm->req_port == port) {
</span><del>- if (jm == root_jobmgr) {
- launchd_shutdown();
- } else {
- return jobmgr_remove(jm);
- }
</del><ins>+ jobmgr_shutdown(jm);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> SLIST_FOREACH_SAFE(jmi, &jm->submgrs, sle, jmn) {
</span></span></pre></div>
<a id="trunklaunchdsrclaunchd_core_logich"></a>
<div class="modfile"><h4>Modified: trunk/launchd/src/launchd_core_logic.h (23041 => 23042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/launchd/src/launchd_core_logic.h 2007-02-08 01:28:03 UTC (rev 23041)
+++ trunk/launchd/src/launchd_core_logic.h 2007-02-08 15:21:26 UTC (rev 23042)
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx"> void jobmgr_set_stdout(jobmgr_t jm, const char *what);
</span><span class="cx"> void jobmgr_set_stderr(jobmgr_t jm, const char *what);
</span><span class="cx"> bool jobmgr_is_idle(jobmgr_t jm);
</span><del>-void jobmgr_remove_all_inactive(jobmgr_t jm);
</del><ins>+jobmgr_t jobmgr_shutdown(jobmgr_t jm);
</ins><span class="cx"> void jobmgr_dispatch_all_semaphores(jobmgr_t jm);
</span><span class="cx"> job_t jobmgr_find(jobmgr_t jm, const char *label);
</span><span class="cx"> void jobmgr_delete_anything_with_port(jobmgr_t jm, mach_port_t port);
</span></span></pre></div>
<a id="trunklaunchdsrcliblaunch_publich"></a>
<div class="modfile"><h4>Modified: trunk/launchd/src/liblaunch_public.h (23041 => 23042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/launchd/src/liblaunch_public.h 2007-02-08 01:28:03 UTC (rev 23041)
+++ trunk/launchd/src/liblaunch_public.h 2007-02-08 15:21:26 UTC (rev 23042)
</span><span class="lines">@@ -78,6 +78,7 @@
</span><span class="cx"> #define LAUNCH_JOBKEY_USERENVIRONMENTVARIABLES "UserEnvironmentVariables"
</span><span class="cx"> #define LAUNCH_JOBKEY_UMASK "Umask"
</span><span class="cx"> #define LAUNCH_JOBKEY_NICE "Nice"
</span><ins>+#define LAUNCH_JOBKEY_HOPEFULLYEXITSLAST "HopefullyExitsLast"
</ins><span class="cx"> #define LAUNCH_JOBKEY_LOWPRIORITYIO "LowPriorityIO"
</span><span class="cx"> #define LAUNCH_JOBKEY_SESSIONCREATE "SessionCreate"
</span><span class="cx"> #define LAUNCH_JOBKEY_SOFTRESOURCELIMITS "SoftResourceLimits"
</span></span></pre>
</div>
</div>
</body>
</html>