<!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>[23051] trunk/launchd/src</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.macosforge.org/projects/launchd/changeset/23051">23051</a></dd>
<dt>Author</dt> <dd>zarzycki@apple.com</dd>
<dt>Date</dt> <dd>2007-02-09 09:56:21 -0800 (Fri, 09 Feb 2007)</dd>
</dl>
<h3>Log Message</h3>
<pre>Better shutdown debugging.</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="#trunklaunchdsrclaunchd_core_logicc">trunk/launchd/src/launchd_core_logic.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunklaunchdsrclaunchdc"></a>
<div class="modfile"><h4>Modified: trunk/launchd/src/launchd.c (23050 => 23051)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/launchd/src/launchd.c 2007-02-09 01:51:31 UTC (rev 23050)
+++ trunk/launchd/src/launchd.c 2007-02-09 17:56:21 UTC (rev 23051)
</span><span class="lines">@@ -394,28 +394,26 @@
</span><span class="cx"> void
</span><span class="cx"> launchd_shutdown(void)
</span><span class="cx"> {
</span><ins>+ struct stat sb;
+
</ins><span class="cx"> if (shutdown_in_progress) {
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> shutdown_in_progress = true;
</span><span class="cx">
</span><del>-#if 0
- struct stat sb;
</del><ins>+ if (getpid() == 1) {
+ if (stat("/var/db/debugShutdownHangs", &sb) != -1) {
+ /*
+ * When this changes to a more sustainable API, update this:
+ * http://howto.apple.com/db.cgi?Debugging_Apps_Non-Responsive_At_Shutdown
+ */
+ debug_shutdown_hangs = true;
+ }
</ins><span class="cx">
</span><del>- if (stat("/var/db/debugShutdownHangs", &sb) != -1) {
- /*
- * When this changes to a more sustainable API, update this:
- * http://howto.apple.com/db.cgi?Debugging_Apps_Non-Responsive_At_Shutdown
- */
- debug_shutdown_hangs = true;
- }
-#else
- if (getpid() == 1) {
</del><span class="cx"> launchd_assumes(kevent_mod((uintptr_t)debugshutdown_callback,
</span><span class="cx"> EVFILT_TIMER, EV_ADD|EV_ONESHOT, NOTE_SECONDS, 5, &kqdebugshutdown_callback) != -1);
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> rlcj = NULL;
</span><span class="cx">
</span><span class="lines">@@ -654,6 +652,9 @@
</span><span class="cx"> pid_t sddp;
</span><span class="cx">
</span><span class="cx"> if (launchd_assumes(posix_spawn(&sddp, sdd_args[0], NULL, NULL, sdd_args, environ) == 0)) {
</span><del>- launchd_assumes(kevent_mod(sddp, EVFILT_PROC, EV_ADD, NOTE_EXIT, 0, &kqsimple_zombie_reaper) != -1);
</del><ins>+ int wstatus;
+
+ /* No bootstrap port was given. It is safe to block. */
+ launchd_assumes(waitpid(sddp, &wstatus, 0) != -1);
</ins><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunklaunchdsrclaunchdh"></a>
<div class="modfile"><h4>Modified: trunk/launchd/src/launchd.h (23050 => 23051)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/launchd/src/launchd.h 2007-02-09 01:51:31 UTC (rev 23050)
+++ trunk/launchd/src/launchd.h 2007-02-09 17:56:21 UTC (rev 23051)
</span><span class="lines">@@ -31,7 +31,6 @@
</span><span class="cx"> struct kevent;
</span><span class="cx"> struct conncb;
</span><span class="cx">
</span><del>-extern kq_callback kqsimple_zombie_reaper;
</del><span class="cx"> extern sigset_t blocked_signals;
</span><span class="cx"> extern bool debug_shutdown_hangs;
</span><span class="cx"> extern bool network_up;
</span></span></pre></div>
<a id="trunklaunchdsrclaunchd_core_logicc"></a>
<div class="modfile"><h4>Modified: trunk/launchd/src/launchd_core_logic.c (23050 => 23051)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/launchd/src/launchd_core_logic.c 2007-02-09 01:51:31 UTC (rev 23050)
+++ trunk/launchd/src/launchd_core_logic.c 2007-02-09 17:56:21 UTC (rev 23051)
</span><span class="lines">@@ -337,22 +337,12 @@
</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><del>-static void simple_zombie_reaper(void *, struct kevent *);
-
-kq_callback kqsimple_zombie_reaper = simple_zombie_reaper;
-
</del><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="cx"> jobmgr_t gc_this_jobmgr;
</span><span class="cx">
</span><span class="cx"> void
</span><del>-simple_zombie_reaper(void *obj __attribute__((unused)), struct kevent *kev)
-{
- waitpid(kev->ident, NULL, 0);
-}
-
-void
</del><span class="cx"> job_ignore(job_t j)
</span><span class="cx"> {
</span><span class="cx"> struct semaphoreitem *si;
</span><span class="lines">@@ -1779,9 +1769,7 @@
</span><span class="cx"> if ((uintptr_t)j == kev->ident || (uintptr_t)&j->start_interval == kev->ident) {
</span><span class="cx"> job_dispatch(j, true);
</span><span class="cx"> } else if ((uintptr_t)&j->exit_timeout == kev->ident) {
</span><del>- if (debug_shutdown_hangs) {
- job_force_sampletool(j);
- }
</del><ins>+ job_force_sampletool(j);
</ins><span class="cx"> job_log(j, LOG_WARNING, "Exit timeout elapsed (%u seconds). Killing.", j->exit_timeout);
</span><span class="cx"> job_assumes(j, kill(j->p, SIGKILL) != -1);
</span><span class="cx"> } else {
</span><span class="lines">@@ -3625,16 +3613,72 @@
</span><span class="cx"> void
</span><span class="cx"> job_force_sampletool(job_t j)
</span><span class="cx"> {
</span><del>- char *sample_args[] = { "sample", NULL, "1", "-mayDie", NULL };
</del><ins>+ struct stat sb;
+ char logfile[PATH_MAX];
</ins><span class="cx"> char pidstr[100];
</span><ins>+ char *sample_args[] = { "sample", pidstr, "1", "-mayDie", "-file", logfile, NULL };
+ char *contents = NULL;
+ int logfile_fd = -1;
+ int console_fd = -1;
</ins><span class="cx"> pid_t sp;
</span><ins>+
+ if (!debug_shutdown_hangs) {
+ return;
+ }
</ins><span class="cx">
</span><span class="cx"> snprintf(pidstr, sizeof(pidstr), "%u", j->p);
</span><del>- sample_args[1] = pidstr;
</del><ins>+ snprintf(logfile, sizeof(logfile), "/var/log/shutdown/%s-%u.sample.txt", j->label, j->p);
</ins><span class="cx">
</span><del>- if (job_assumes(j, posix_spawnp(&sp, sample_args[0], NULL, NULL, sample_args, environ) == 0)) {
- job_assumes(j, kevent_mod(sp, EVFILT_PROC, EV_ADD, NOTE_EXIT, 0, &kqsimple_zombie_reaper) != -1);
</del><ins>+ job_assumes(j, mkdir("/var/log/shutdown", S_IRWXU) != -1 || errno == EEXIST);
+
+ /*
+ * This will stall launchd for as long as the 'sample' tool runs.
+ *
+ * We didn't give the 'sample' tool a bootstrap port, so it therefore
+ * can't deadlock against launchd.
+ */
+ if (job_assumes(j, (errno = posix_spawnp(&sp, sample_args[0], NULL, NULL, sample_args, environ)) == 0)) {
+ int wstatus;
+
+ job_assumes(j, waitpid(sp, &wstatus, 0) != -1);
</ins><span class="cx"> }
</span><ins>+
+ if (!job_assumes(j, (logfile_fd = open(logfile, O_RDONLY|O_NOCTTY)) != -1)) {
+ goto out;
+ }
+
+ if (!job_assumes(j, (console_fd = open(_PATH_CONSOLE, O_WRONLY|O_APPEND||O_NOCTTY)) != -1)) {
+ goto out;
+ }
+
+ if (!job_assumes(j, fstat(logfile_fd, &sb) != -1)) {
+ goto out;
+ }
+
+ contents = malloc(sb.st_size);
+
+ if (!job_assumes(j, contents != NULL)) {
+ goto out;
+ }
+
+ if (!job_assumes(j, read(logfile_fd, contents, sb.st_size) == sb.st_size)) {
+ goto out;
+ }
+
+ job_assumes(j, write(console_fd, contents, sb.st_size) == sb.st_size);
+
+out:
+ if (contents) {
+ free(contents);
+ }
+
+ if (logfile_fd != -1) {
+ job_assumes(j, close(logfile_fd) != -1);
+ }
+
+ if (console_fd != -1) {
+ job_assumes(j, close(console_fd) != -1);
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool
</span></span></pre>
</div>
</div>
</body>
</html>