<!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>[23052] 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/23052">23052</a></dd>
<dt>Author</dt> <dd>zarzycki@apple.com</dd>
<dt>Date</dt> <dd>2007-02-09 14:31:36 -0800 (Fri, 09 Feb 2007)</dd>
</dl>
<h3>Log Message</h3>
<pre>Even better shutdown debugging.</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 (23051 => 23052)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/launchd/src/launchd_core_logic.c 2007-02-09 17:56:21 UTC (rev 23051)
+++ trunk/launchd/src/launchd_core_logic.c 2007-02-09 22:31:36 UTC (rev 23052)
</span><span class="lines">@@ -32,6 +32,7 @@
</span><span class="cx"> #include <mach/host_info.h>
</span><span class="cx"> #include <mach/mach_host.h>
</span><span class="cx"> #include <mach/exception.h>
</span><ins>+#include <mach/host_reboot.h>
</ins><span class="cx"> #include <sys/types.h>
</span><span class="cx"> #include <sys/queue.h>
</span><span class="cx"> #include <sys/event.h>
</span><span class="lines">@@ -199,6 +200,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><ins>+ unsigned int would_have_sigkilled;
</ins><span class="cx"> unsigned int transfer_bstrap:1, sent_stop_to_hopeful_jobs:1, shutting_down:1;
</span><span class="cx"> char name[0];
</span><span class="cx"> };
</span><span class="lines">@@ -209,6 +211,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 void jobmgr_log_stray_children(jobmgr_t jm);
</ins><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="cx"> static job_t jobmgr_new_anonymous(jobmgr_t jm);
</span><span class="lines">@@ -305,6 +308,7 @@
</span><span class="cx"> static const char *job_prog(job_t j);
</span><span class="cx"> static pid_t job_get_pid(job_t j);
</span><span class="cx"> static jobmgr_t job_get_bs(job_t j);
</span><ins>+static void job_kill(job_t j);
</ins><span class="cx"> static void job_uncork_fork(job_t j);
</span><span class="cx"> static void job_log_stdouterr(job_t j);
</span><span class="cx"> static void job_logv(job_t j, int pri, int err, const char *msg, va_list ap);
</span><span class="lines">@@ -337,6 +341,7 @@
</span><span class="cx"> static bool cronemu_hour(struct tm *wtm, int hour, int min);
</span><span class="cx"> static bool cronemu_min(struct tm *wtm, int min);
</span><span class="cx">
</span><ins>+static unsigned int total_children;
</ins><span class="cx"> static int dir_has_files(job_t j, const char *path);
</span><span class="cx"> static char **mach_cmd2argv(const char *string);
</span><span class="cx"> jobmgr_t root_jobmgr;
</span><span class="lines">@@ -1628,6 +1633,8 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ total_children--;
+
</ins><span class="cx"> /* Performance hack */
</span><span class="cx"> TAILQ_REMOVE(&j->mgr->jobs, j, sle);
</span><span class="cx"> TAILQ_INSERT_TAIL(&j->mgr->jobs, j, sle);
</span><span class="lines">@@ -1756,6 +1763,19 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void
</span><ins>+job_kill(job_t j)
+{
+ if (debug_shutdown_hangs) {
+ j->mgr->would_have_sigkilled++;
+ if (j->mgr->would_have_sigkilled >= total_children) {
+ job_assumes(j, host_reboot(mach_host_self(), HOST_REBOOT_DEBUGGER) == 0);
+ }
+ } else {
+ job_assumes(j, kill(j->p, SIGKILL) != -1);
+ }
+}
+
+void
</ins><span class="cx"> job_callback(void *obj, struct kevent *kev)
</span><span class="cx"> {
</span><span class="cx"> job_t j = obj;
</span><span class="lines">@@ -1771,7 +1791,7 @@
</span><span class="cx"> } else if ((uintptr_t)&j->exit_timeout == kev->ident) {
</span><span class="cx"> job_force_sampletool(j);
</span><span class="cx"> job_log(j, LOG_WARNING, "Exit timeout elapsed (%u seconds). Killing.", j->exit_timeout);
</span><del>- job_assumes(j, kill(j->p, SIGKILL) != -1);
</del><ins>+ job_kill(j);
</ins><span class="cx"> } else {
</span><span class="cx"> calendarinterval_callback(j, kev);
</span><span class="cx"> }
</span><span class="lines">@@ -1883,6 +1903,8 @@
</span><span class="cx"> job_start_child(j);
</span><span class="cx"> break;
</span><span class="cx"> default:
</span><ins>+ total_children++;
+
</ins><span class="cx"> /* Performance hack */
</span><span class="cx"> TAILQ_REMOVE(&j->mgr->jobs, j, sle);
</span><span class="cx"> TAILQ_INSERT_HEAD(&j->mgr->jobs, j, sle);
</span><span class="lines">@@ -2810,16 +2832,7 @@
</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>- unsigned int cnt = 0;
- job_t ji;
-
- TAILQ_FOREACH(ji, &j->mgr->jobs, sle) {
- if (ji->p) {
- cnt++;
- }
- }
-
- job_log(j, LOG_INFO, "Exited while shutdown in progress. Processes remaining: %u", cnt);
</del><ins>+ job_log(j, LOG_NOTICE, "Exited while shutdown in progress. Processes remaining: %u", total_children);
</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">@@ -3197,6 +3210,7 @@
</span><span class="cx"> jm->sent_stop_to_hopeful_jobs = true;
</span><span class="cx">
</span><span class="cx"> if (jobmgr_is_idle(jm)) {
</span><ins>+ jobmgr_log_stray_children(jm);
</ins><span class="cx"> jobmgr_remove(jm);
</span><span class="cx"> return NULL;
</span><span class="cx"> }
</span><span class="lines">@@ -3204,6 +3218,42 @@
</span><span class="cx"> return jm;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void
+jobmgr_log_stray_children(jobmgr_t jm)
+{
+ int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_ALL };
+ size_t i, kp_cnt, len = 10*1024*1024;
+ struct kinfo_proc *kp;
+
+ if (jm->parentmgr || getpid() != 1) {
+ return;
+ }
+
+ if (!jobmgr_assumes(jm, (kp = malloc(len)) != NULL)) {
+ return;
+ }
+ if (!jobmgr_assumes(jm, sysctl(mib, 3, kp, &len, NULL, 0) != -1)) {
+ goto out;
+ }
+
+ kp_cnt = len / sizeof(struct kinfo_proc);
+
+ for (i = 0; i < kp_cnt; i++) {
+ pid_t p_i = kp[i].kp_proc.p_pid;
+ pid_t pp_i = kp[i].kp_eproc.e_ppid;
+
+ if (p_i == 0 || p_i == 1) {
+ continue;
+ }
+
+ jobmgr_log(jm, LOG_WARNING, "Stray process at shutdown: PID %u PPID %u %s", p_i, pp_i, kp[i].kp_proc.p_comm);
+ jobmgr_assumes(jm, kill(p_i, SIGKILL) != -1);
+ }
+
+out:
+ free(kp);
+}
+
</ins><span class="cx"> bool
</span><span class="cx"> jobmgr_is_idle(jobmgr_t jm)
</span><span class="cx"> {
</span></span></pre>
</div>
</div>
</body>
</html>