<!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>[23053] trunk/launchd/src</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.macosforge.org/projects/launchd/changeset/23053">23053</a></dd>
<dt>Author</dt> <dd>zarzycki@apple.com</dd>
<dt>Date</dt> <dd>2007-02-09 14:51:16 -0800 (Fri, 09 Feb 2007)</dd>
</dl>
<h3>Log Message</h3>
<pre>Move call to exit() and reboot() to jobmgr_remove(root_jobmgr).</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunklaunchdsrclaunchdc">trunk/launchd/src/launchd.c</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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunklaunchdsrclaunchdc"></a>
<div class="modfile"><h4>Modified: trunk/launchd/src/launchd.c (23052 => 23053)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/launchd/src/launchd.c 2007-02-09 22:31:36 UTC (rev 23052)
+++ trunk/launchd/src/launchd.c 2007-02-09 22:51:16 UTC (rev 23053)
</span><span class="lines">@@ -417,7 +417,7 @@
</span><span class="cx">
</span><span class="cx"> rlcj = NULL;
</span><span class="cx">
</span><del>- root_jobmgr = jobmgr_shutdown(root_jobmgr);
</del><ins>+ launchd_assert(jobmgr_shutdown(root_jobmgr) != NULL);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void
</span><span class="lines">@@ -624,7 +624,8 @@
</span><span class="cx"> void
</span><span class="cx"> launchd_post_kevent(void)
</span><span class="cx"> {
</span><del>- if (shutdown_in_progress && (!root_jobmgr || jobmgr_is_idle(root_jobmgr))) {
</del><ins>+#if 0
+ if (shutdown_in_progress && 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 class="lines">@@ -632,11 +633,9 @@
</span><span class="cx"> kill(-1, SIGKILL); /* One last time, just to clear the room */
</span><span class="cx"> launchd_assumes(execl("/sbin/launchd", "/sbin/launchd", "-s", NULL) != -1);
</span><span class="cx"> }
</span><del>- launchd_assumes(reboot(RB_HALT) != -1);
- } else {
- exit(EXIT_SUCCESS);
</del><span class="cx"> }
</span><span class="cx"> }
</span><ins>+#endif
</ins><span class="cx"> if (getpid() == 1) {
</span><span class="cx"> if (rlcj && job_active(rlcj)) {
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunklaunchdsrclaunchd_core_logicc"></a>
<div class="modfile"><h4>Modified: trunk/launchd/src/launchd_core_logic.c (23052 => 23053)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/launchd/src/launchd_core_logic.c 2007-02-09 22:31:36 UTC (rev 23052)
+++ trunk/launchd/src/launchd_core_logic.c 2007-02-09 22:51:16 UTC (rev 23053)
</span><span class="lines">@@ -40,6 +40,7 @@
</span><span class="cx"> #include <sys/ucred.h>
</span><span class="cx"> #include <sys/fcntl.h>
</span><span class="cx"> #include <sys/un.h>
</span><ins>+#include <sys/reboot.h>
</ins><span class="cx"> #include <sys/wait.h>
</span><span class="cx"> #include <sys/sysctl.h>
</span><span class="cx"> #include <sys/sockio.h>
</span><span class="lines">@@ -211,6 +212,7 @@
</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><span class="cx"> static jobmgr_t jobmgr_tickle(jobmgr_t jm);
</span><ins>+static bool jobmgr_is_idle(jobmgr_t jm);
</ins><span class="cx"> static void jobmgr_log_stray_children(jobmgr_t jm);
</span><span class="cx"> static void jobmgr_remove(jobmgr_t jm);
</span><span class="cx"> static void jobmgr_dispatch_all(jobmgr_t jm);
</span><span class="lines">@@ -576,6 +578,10 @@
</span><span class="cx"> if (jm->parentmgr) {
</span><span class="cx"> SLIST_REMOVE(&jm->parentmgr->submgrs, jm, jobmgr_s, sle);
</span><span class="cx"> jobmgr_tickle(jm->parentmgr);
</span><ins>+ } else if (getpid() == 1) {
+ jobmgr_assumes(jm, reboot(RB_HALT) != -1);
+ } else {
+ exit(EXIT_SUCCESS);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> free(jm);
</span></span></pre></div>
<a id="trunklaunchdsrclaunchd_core_logich"></a>
<div class="modfile"><h4>Modified: trunk/launchd/src/launchd_core_logic.h (23052 => 23053)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/launchd/src/launchd_core_logic.h 2007-02-09 22:31:36 UTC (rev 23052)
+++ trunk/launchd/src/launchd_core_logic.h 2007-02-09 22:51:16 UTC (rev 23053)
</span><span class="lines">@@ -31,7 +31,6 @@
</span><span class="cx">
</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><del>-bool jobmgr_is_idle(jobmgr_t jm);
</del><span class="cx"> jobmgr_t jobmgr_shutdown(jobmgr_t jm);
</span><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></pre>
</div>
</div>
</body>
</html>