<!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>[23150] 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/23150">23150</a></dd>
<dt>Author</dt> <dd>zarzycki@apple.com</dd>
<dt>Date</dt> <dd>2007-03-14 09:38:43 -0700 (Wed, 14 Mar 2007)</dd>
</dl>
<h3>Log Message</h3>
<pre>Small logging changes.</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 (23149 => 23150)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/launchd/src/launchd_core_logic.c 2007-03-09 21:00:17 UTC (rev 23149)
+++ trunk/launchd/src/launchd_core_logic.c 2007-03-14 16:38:43 UTC (rev 23150)
</span><span class="lines">@@ -92,7 +92,7 @@
</span><span class="cx"> #define LAUNCHD_MIN_JOB_RUN_TIME 10
</span><span class="cx"> #define LAUNCHD_ADVISABLE_IDLE_TIMEOUT 30
</span><span class="cx"> #define LAUNCHD_DEFAULT_EXIT_TIMEOUT 20
</span><del>-#define LAUNCHD_SIGKILL_TIMEOUT 5
</del><ins>+#define LAUNCHD_SIGKILL_TIMER 5
</ins><span class="cx">
</span><span class="cx"> extern char **environ;
</span><span class="cx">
</span><span class="lines">@@ -1832,7 +1832,7 @@
</span><span class="cx"> j->sent_sigkill = true;
</span><span class="cx">
</span><span class="cx"> job_assumes(j, kevent_mod((uintptr_t)&j->exit_timeout, EVFILT_TIMER,
</span><del>- EV_ADD, NOTE_SECONDS, LAUNCHD_SIGKILL_TIMEOUT, j) != -1);
</del><ins>+ EV_ADD, NOTE_SECONDS, LAUNCHD_SIGKILL_TIMER, j) != -1);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void
</span><span class="lines">@@ -1869,6 +1869,7 @@
</span><span class="cx">
</span><span class="cx"> job_assumes(j, gettimeofday(&tve, NULL) != -1);
</span><span class="cx"> timersub(&tve, &j->sent_sigterm_time, &tvd);
</span><ins>+ tvd.tv_sec -= j->exit_timeout;
</ins><span class="cx"> job_log(j, LOG_ERR, "Did not die after sending SIGKILL %lu seconds ago...", tvd.tv_sec);
</span><span class="cx"> } else {
</span><span class="cx"> job_force_sampletool(j);
</span><span class="lines">@@ -3340,12 +3341,15 @@
</span><span class="cx"> for (i = 0; i < kp_cnt; i++) {
</span><span class="cx"> pid_t p_i = kp[i].kp_proc.p_pid;
</span><span class="cx"> pid_t pp_i = kp[i].kp_eproc.e_ppid;
</span><ins>+ const char *z = kp[i].kp_proc.p_stat == SZOMB ? "zombie " : "";
+ const char *n = kp[i].kp_proc.p_comm;
</ins><span class="cx">
</span><span class="cx"> if (p_i == 0 || p_i == 1) {
</span><span class="cx"> continue;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- jobmgr_log(jm, LOG_WARNING, "Stray process at shutdown: PID %u PPID %u %s", p_i, pp_i, kp[i].kp_proc.p_comm);
</del><ins>+ jobmgr_log(jm, LOG_WARNING, "Stray %sprocess at shutdown: PID %u PPID %u %s", z, p_i, pp_i, n);
+
</ins><span class="cx"> /*
</span><span class="cx"> * The kernel team requested that I not do this for Leopard.
</span><span class="cx"> * jobmgr_assumes(jm, kill(p_i, SIGKILL) != -1);
</span></span></pre>
</div>
</div>
</body>
</html>