<!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, #msg p { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul { 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>[23466] trunk/launchd/src</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.macosforge.org/projects/launchd/changeset/23466">23466</a></dd>
<dt>Author</dt> <dd>zarzycki@apple.com</dd>
<dt>Date</dt> <dd>2007-12-12 16:16:27 -0800 (Wed, 12 Dec 2007)</dd>
</dl>
<h3>Log Message</h3>
<pre>Misc logging updates.</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>
<li><a href="#trunklaunchdsrclaunchd_runtimec">trunk/launchd/src/launchd_runtime.c</a></li>
<li><a href="#trunklaunchdsrclaunchd_runtimeh">trunk/launchd/src/launchd_runtime.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 (23465 => 23466)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/launchd/src/launchd.c 2007-12-12 21:54:32 UTC (rev 23465)
+++ trunk/launchd/src/launchd.c 2007-12-13 00:16:27 UTC (rev 23466)
</span><span class="lines">@@ -99,8 +99,7 @@
</span><span class="cx"> static void *crash_addr;
</span><span class="cx"> static pid_t crash_pid;
</span><span class="cx">
</span><del>-static bool shutdown_in_progress = false;
-bool debug_shutdown_hangs = false;
</del><ins>+bool shutdown_in_progress = false;
</ins><span class="cx"> bool network_up = false;
</span><span class="cx">
</span><span class="cx"> int
</span><span class="lines">@@ -246,7 +245,6 @@
</span><span class="cx"> launchd_shutdown(void)
</span><span class="cx"> {
</span><span class="cx"> struct timeval tvnow;
</span><del>- struct stat sb;
</del><span class="cx">
</span><span class="cx"> if (shutdown_in_progress) {
</span><span class="cx"> return;
</span><span class="lines">@@ -254,14 +252,13 @@
</span><span class="cx">
</span><span class="cx"> shutdown_in_progress = true;
</span><span class="cx">
</span><del>- if (getpid() == 1 && stat("/var/db/debugShutdownHangs", &sb) != -1) {
</del><ins>+ if (getpid() == 1) {
</ins><span class="cx"> /*
</span><span class="cx"> * When this changes to a more sustainable API, update this:
</span><span class="cx"> * http://howto.apple.com/db.cgi?Debugging_Apps_Non-Responsive_At_Shutdown
</span><span class="cx"> */
</span><span class="cx"> runtime_setlogmask(LOG_UPTO(LOG_DEBUG));
</span><span class="cx"> prep_shutdown_log_dir();
</span><del>- debug_shutdown_hangs = true;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (launchd_assumes(gettimeofday(&tvnow, NULL) != -1)) {
</span></span></pre></div>
<a id="trunklaunchdsrclaunchdh"></a>
<div class="modfile"><h4>Modified: trunk/launchd/src/launchd.h (23465 => 23466)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/launchd/src/launchd.h 2007-12-12 21:54:32 UTC (rev 23465)
+++ trunk/launchd/src/launchd.h 2007-12-13 00:16:27 UTC (rev 23466)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx"> struct kevent;
</span><span class="cx"> struct conncb;
</span><span class="cx">
</span><del>-extern bool debug_shutdown_hangs;
</del><ins>+extern bool shutdown_in_progress;
</ins><span class="cx"> extern bool network_up;
</span><span class="cx">
</span><span class="cx"> bool init_check_pid(pid_t);
</span></span></pre></div>
<a id="trunklaunchdsrclaunchd_core_logicc"></a>
<div class="modfile"><h4>Modified: trunk/launchd/src/launchd_core_logic.c (23465 => 23466)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/launchd/src/launchd_core_logic.c 2007-12-12 21:54:32 UTC (rev 23465)
+++ trunk/launchd/src/launchd_core_logic.c 2007-12-13 00:16:27 UTC (rev 23466)
</span><span class="lines">@@ -710,7 +710,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (debug_shutdown_hangs && jm->parentmgr == NULL && getpid() == 1) {
</del><ins>+ if (do_apple_internal_logging() && jm->parentmgr == NULL && getpid() == 1) {
</ins><span class="cx"> runtime_set_timeout(still_alive_with_check, 5);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -4294,7 +4294,7 @@
</span><span class="cx"> jobmgr_log_stray_children(jobmgr_t jm)
</span><span class="cx"> {
</span><span class="cx"> int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_ALL };
</span><del>- size_t i, kp_cnt, len = 10*1024*1024;
</del><ins>+ size_t i, kp_cnt = 0, kp_skipped = 0, len = 10*1024*1024;
</ins><span class="cx"> struct kinfo_proc *kp;
</span><span class="cx">
</span><span class="cx"> if (jm->parentmgr || getpid() != 1) {
</span><span class="lines">@@ -4318,6 +4318,7 @@
</span><span class="cx"> const char *n = kp[i].kp_proc.p_comm;
</span><span class="cx">
</span><span class="cx"> if (p_i == 0 || p_i == 1) {
</span><ins>+ kp_skipped++;
</ins><span class="cx"> continue;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -4330,6 +4331,10 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> out:
</span><ins>+ if (kp_cnt == kp_skipped) {
+ jobmgr_log(jm, LOG_DEBUG, "No stray processes at shutdown");
+ }
+
</ins><span class="cx"> free(kp);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -4766,7 +4771,7 @@
</span><span class="cx"> int wstatus;
</span><span class="cx"> pid_t sp;
</span><span class="cx">
</span><del>- if (!debug_shutdown_hangs) {
</del><ins>+ if (!do_apple_internal_logging()) {
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -6702,7 +6707,7 @@
</span><span class="cx"> do_unmounts(void)
</span><span class="cx"> {
</span><span class="cx"> struct statfs buf[250];
</span><del>- int i, found, returned;
</del><ins>+ int r, i, found, returned;
</ins><span class="cx">
</span><span class="cx"> do {
</span><span class="cx"> returned = getfsstat(buf, sizeof(buf), MNT_NOWAIT);
</span><span class="lines">@@ -6720,8 +6725,11 @@
</span><span class="cx"> continue;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- runtime_syslog(LOG_DEBUG, "About to unmount: %s", buf[i].f_mntonname);
- if (launchd_assumes(unmount(buf[i].f_mntonname, 0) != -1)) {
</del><ins>+ r = unmount(buf[i].f_mntonname, 0);
+
+ runtime_syslog(LOG_DEBUG, "unmount(\"%s\", 0): %s", buf[i].f_mntonname, r == -1 ? strerror(errno) : "Success");
+
+ if (r != -1) {
</ins><span class="cx"> found++;
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunklaunchdsrclaunchd_runtimec"></a>
<div class="modfile"><h4>Modified: trunk/launchd/src/launchd_runtime.c (23465 => 23466)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/launchd/src/launchd_runtime.c 2007-12-12 21:54:32 UTC (rev 23465)
+++ trunk/launchd/src/launchd_runtime.c 2007-12-13 00:16:27 UTC (rev 23466)
</span><span class="lines">@@ -1131,7 +1131,7 @@
</span><span class="cx"> int
</span><span class="cx"> runtime_fsync(int fd)
</span><span class="cx"> {
</span><del>- if (debug_shutdown_hangs) {
</del><ins>+ if (do_apple_internal_logging()) {
</ins><span class="cx"> return fcntl(fd, F_FULLFSYNC, NULL);
</span><span class="cx"> } else {
</span><span class="cx"> return fsync(fd);
</span><span class="lines">@@ -1169,19 +1169,13 @@
</span><span class="cx"> static pthread_mutex_t ourlock = PTHREAD_MUTEX_INITIALIZER;
</span><span class="cx"> static struct timeval shutdown_start;
</span><span class="cx"> static struct timeval prev_msg;
</span><del>- static int apple_internal_logging = 1;
</del><span class="cx"> struct timeval tvnow, tvd_total, tvd_msg_delta = { 0, 0 };
</span><del>- struct stat sb;
</del><span class="cx"> int saved_errno = errno;
</span><span class="cx"> char newmsg[10000];
</span><span class="cx"> size_t i, j;
</span><span class="cx">
</span><del>- if (apple_internal_logging == 1) {
- apple_internal_logging = stat("/AppleInternal", &sb);
- }
-
</del><span class="cx"> if (attr->priority == LOG_APPLEONLY) {
</span><del>- if (apple_internal_logging == 0) {
</del><ins>+ if (do_apple_internal_logging()) {
</ins><span class="cx"> attr->priority = LOG_NOTICE;
</span><span class="cx"> } else {
</span><span class="cx"> return;
</span><span class="lines">@@ -1192,7 +1186,7 @@
</span><span class="cx"> goto out;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (!(debug_shutdown_hangs && getpid() == 1)) {
</del><ins>+ if (getpid() != 1 || !shutdown_in_progress) {
</ins><span class="cx"> vsnprintf(newmsg, sizeof(newmsg), message, args);
</span><span class="cx"> logmsg_add(attr, saved_errno, newmsg);
</span><span class="cx"> goto out;
</span><span class="lines">@@ -1567,3 +1561,16 @@
</span><span class="cx">
</span><span class="cx"> launchd_mport_deallocate(mhs);
</span><span class="cx"> }
</span><ins>+
+bool
+do_apple_internal_logging(void)
+{
+ static int apple_internal_logging = 1;
+ struct stat sb;
+
+ if (apple_internal_logging == 1) {
+ apple_internal_logging = stat("/AppleInternal", &sb);
+ }
+
+ return (apple_internal_logging == 0);
+}
</ins></span></pre></div>
<a id="trunklaunchdsrclaunchd_runtimeh"></a>
<div class="modfile"><h4>Modified: trunk/launchd/src/launchd_runtime.h (23465 => 23466)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/launchd/src/launchd_runtime.h 2007-12-12 21:54:32 UTC (rev 23465)
+++ trunk/launchd/src/launchd_runtime.h 2007-12-13 00:16:27 UTC (rev 23466)
</span><span class="lines">@@ -123,6 +123,7 @@
</span><span class="cx"> const char *reboot_flags_to_C_names(unsigned int flags);
</span><span class="cx"> const char *proc_flags_to_C_names(unsigned int flags);
</span><span class="cx">
</span><ins>+bool do_apple_internal_logging(void);
</ins><span class="cx">
</span><span class="cx"> int kevent_bulk_mod(struct kevent *kev, size_t kev_cnt);
</span><span class="cx"> int kevent_mod(uintptr_t ident, short filter, u_short flags, u_int fflags, intptr_t data, void *udata);
</span></span></pre>
</div>
</div>
</body>
</html>