<!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>[23046] trunk/launchd/src</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.macosforge.org/projects/launchd/changeset/23046">23046</a></dd>
<dt>Author</dt> <dd>zarzycki@apple.com</dd>
<dt>Date</dt> <dd>2007-02-08 14:39:50 -0800 (Thu, 08 Feb 2007)</dd>
</dl>
<h3>Log Message</h3>
<pre>More shutdown logic clean up and sanity checking.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunklaunchdsrclaunchd_core_logicc">trunk/launchd/src/launchd_core_logic.c</a></li>
<li><a href="#trunklaunchdsrclaunchd_runtimec">trunk/launchd/src/launchd_runtime.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 (23045 => 23046)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/launchd/src/launchd_core_logic.c 2007-02-08 18:04:06 UTC (rev 23045)
+++ trunk/launchd/src/launchd_core_logic.c 2007-02-08 22:39:50 UTC (rev 23046)
</span><span class="lines">@@ -516,6 +516,8 @@
</span><span class="cx"> jobmgr_t jmi, jmn;
</span><span class="cx"> job_t ji, jn;
</span><span class="cx">
</span><ins>+ jobmgr_log(jm, LOG_DEBUG, "Beginning job manager shutdown");
+
</ins><span class="cx"> SLIST_FOREACH_SAFE(jmi, &jm->submgrs, sle, jmn) {
</span><span class="cx"> jobmgr_shutdown(jmi);
</span><span class="cx"> }
</span><span class="lines">@@ -539,18 +541,22 @@
</span><span class="cx"> jobmgr_t jmi;
</span><span class="cx"> job_t ji;
</span><span class="cx">
</span><del>- while ((jmi = SLIST_FIRST(&jm->submgrs))) {
- jobmgr_remove(jmi);
</del><ins>+ jobmgr_log(jm, LOG_DEBUG, "Removed job manager");
+
+ if (!jobmgr_assumes(jm, SLIST_EMPTY(&jm->submgrs))) {
+ while ((jmi = SLIST_FIRST(&jm->submgrs))) {
+ jobmgr_remove(jmi);
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+ /* We should have one job left and it should be the anonymous job */
+ ji = SLIST_FIRST(&jm->jobs);
+ jobmgr_assumes(jm, ji && ji == jm->anonj && (SLIST_NEXT(ji, sle) == NULL));
+
</ins><span class="cx"> while ((ji = SLIST_FIRST(&jm->jobs))) {
</span><span class="cx"> job_remove(ji);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (jm->parentmgr) {
- SLIST_REMOVE(&jm->parentmgr->submgrs, jm, jobmgr_s, sle);
- }
-
</del><span class="cx"> if (jm->req_port) {
</span><span class="cx"> jobmgr_assumes(jm, launchd_mport_deallocate(jm->req_port) == KERN_SUCCESS);
</span><span class="cx"> }
</span><span class="lines">@@ -570,6 +576,11 @@
</span><span class="cx"> if (jm->jm_stderr) {
</span><span class="cx"> free(jm->jm_stderr);
</span><span class="cx"> }
</span><ins>+
+ if (jm->parentmgr) {
+ SLIST_REMOVE(&jm->parentmgr->submgrs, jm, jobmgr_s, sle);
+ jobmgr_tickle(jm->parentmgr);
+ }
</ins><span class="cx">
</span><span class="cx"> free(jm);
</span><span class="cx"> }
</span><span class="lines">@@ -590,20 +601,16 @@
</span><span class="cx"> job_set_global_on_demand(j, false);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (j->p && !j->anonymous) {
- if (kevent_mod(j->p, EVFILT_PROC, EV_ADD, NOTE_EXIT, 0, &kqsimple_zombie_reaper) == -1) {
- job_reap(j);
- } else {
- /* we've attached the simple zombie reaper, we're going to delete the job before it is dead */
- job_stop(j);
- }
</del><ins>+ if (!job_assumes(j, j->p == 0)) {
+ job_assumes(j, kill(j->p, SIGKILL) != -1);
+ job_reap(j);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- if (j->forkfd) {
</del><ins>+ if (!job_assumes(j, j->forkfd == 0)) {
</ins><span class="cx"> job_assumes(j, close(j->forkfd) != -1);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (j->log_redirect_fd) {
</del><ins>+ if (!job_assumes(j, j->log_redirect_fd == 0)) {
</ins><span class="cx"> job_assumes(j, close(j->log_redirect_fd) != -1);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2803,7 +2810,16 @@
</span><span class="cx"> job_log(j, LOG_INFO, "Exited. Was only configured to run once.");
</span><span class="cx"> return true;
</span><span class="cx"> } else if (j->mgr->shutting_down) {
</span><del>- job_log(j, LOG_INFO, "Exited while shutdown in progress.");
</del><ins>+ unsigned int cnt = 0;
+ job_t ji;
+
+ SLIST_FOREACH(ji, &j->mgr->jobs, sle) {
+ if (ji->p) {
+ cnt++;
+ }
+ }
+
+ job_log(j, LOG_INFO, "Exited while shutdown in progress. Processes remaining: %u", cnt);
</ins><span class="cx"> return true;
</span><span class="cx"> } else if (!j->checkedin && (!SLIST_EMPTY(&j->sockets) || !SLIST_EMPTY(&j->machservices))) {
</span><span class="cx"> job_log(j, LOG_WARNING, "Failed to check-in!");
</span><span class="lines">@@ -3193,6 +3209,10 @@
</span><span class="cx"> {
</span><span class="cx"> job_t ji;
</span><span class="cx">
</span><ins>+ if (!SLIST_EMPTY(&jm->submgrs)) {
+ return false;
+ }
+
</ins><span class="cx"> SLIST_FOREACH(ji, &jm->jobs, sle) {
</span><span class="cx"> if (ji->p) {
</span><span class="cx"> return false;
</span><span class="lines">@@ -3320,6 +3340,8 @@
</span><span class="cx">
</span><span class="cx"> jobmgr_assumes(jmr, jmr->anonj != NULL);
</span><span class="cx">
</span><ins>+ jobmgr_log(jmr, LOG_DEBUG, "Created job manager");
+
</ins><span class="cx"> return jmr;
</span><span class="cx">
</span><span class="cx"> out_bad:
</span></span></pre></div>
<a id="trunklaunchdsrclaunchd_runtimec"></a>
<div class="modfile"><h4>Modified: trunk/launchd/src/launchd_runtime.c (23045 => 23046)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/launchd/src/launchd_runtime.c 2007-02-08 18:04:06 UTC (rev 23045)
+++ trunk/launchd/src/launchd_runtime.c 2007-02-08 22:39:50 UTC (rev 23046)
</span><span class="lines">@@ -35,6 +35,7 @@
</span><span class="cx"> #include <mach/mach_host.h>
</span><span class="cx"> #include <mach/exception.h>
</span><span class="cx"> #include <sys/types.h>
</span><ins>+#include <sys/stat.h>
</ins><span class="cx"> #include <sys/time.h>
</span><span class="cx"> #include <sys/event.h>
</span><span class="cx"> #include <sys/queue.h>
</span><span class="lines">@@ -578,7 +579,7 @@
</span><span class="cx">
</span><span class="cx"> /* XXX - So very gross */
</span><span class="cx"> if (gc_this_jobmgr) {
</span><del>- jobmgr_remove(gc_this_jobmgr);
</del><ins>+ jobmgr_shutdown(gc_this_jobmgr);
</ins><span class="cx"> gc_this_jobmgr = NULL;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -674,7 +675,9 @@
</span><span class="cx"> pthread_mutex_lock(&ourlock);
</span><span class="cx">
</span><span class="cx"> if (ourlogfile == NULL) {
</span><ins>+ rename("/var/log/launchd_raw.log", "/var/log/launchd_raw-old.log");
</ins><span class="cx"> ourlogfile = fopen("/var/log/launchd_raw.log", "a");
</span><ins>+ chmod("/var/log/launchd_raw.log", DEFFILEMODE);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> pthread_mutex_unlock(&ourlock);
</span></span></pre>
</div>
</div>
</body>
</html>