<!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>[23484] trunk/launchd/src</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.macosforge.org/projects/launchd/changeset/23484">23484</a></dd>
<dt>Author</dt> <dd>zarzycki@apple.com</dd>
<dt>Date</dt> <dd>2008-01-16 12:56:12 -0800 (Wed, 16 Jan 2008)</dd>
</dl>
<h3>Log Message</h3>
<pre>A simple change.</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 (23483 => 23484)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/launchd/src/launchd.c 2008-01-15 00:51:21 UTC (rev 23483)
+++ trunk/launchd/src/launchd.c 2008-01-16 20:56:12 UTC (rev 23484)
</span><span class="lines">@@ -77,7 +77,6 @@
</span><span class="cx">
</span><span class="cx"> #define LAUNCHD_CONF ".launchd.conf"
</span><span class="cx"> #define SECURITY_LIB "/System/Library/Frameworks/Security.framework/Versions/A/Security"
</span><del>-#define SHUTDOWN_LOG_DIR "/var/log/shutdown"
</del><span class="cx">
</span><span class="cx">
</span><span class="cx"> extern char **environ;
</span><span class="lines">@@ -93,7 +92,6 @@
</span><span class="cx"> static void monitor_networking_state(void);
</span><span class="cx"> static void fatal_signal_handler(int sig, siginfo_t *si, void *uap);
</span><span class="cx"> static void handle_pid1_crashes_separately(void);
</span><del>-static void prep_shutdown_log_dir(void);
</del><span class="cx">
</span><span class="cx"> static bool re_exec_in_single_user_mode;
</span><span class="cx"> static void *crash_addr;
</span><span class="lines">@@ -236,12 +234,6 @@
</span><span class="cx"> return fd;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void
-prep_shutdown_log_dir(void)
-{
- launchd_assumes(mkdir(SHUTDOWN_LOG_DIR, S_IRWXU) != -1 || errno == EEXIST);
-}
-
</del><span class="cx"> INTERNAL_ABI void
</span><span class="cx"> launchd_shutdown(void)
</span><span class="cx"> {
</span><span class="lines">@@ -259,7 +251,6 @@
</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><del>- prep_shutdown_log_dir();
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> runtime_log_push();
</span></span></pre></div>
<a id="trunklaunchdsrclaunchdh"></a>
<div class="modfile"><h4>Modified: trunk/launchd/src/launchd.h (23483 => 23484)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/launchd/src/launchd.h 2008-01-15 00:51:21 UTC (rev 23483)
+++ trunk/launchd/src/launchd.h 2008-01-16 20:56:12 UTC (rev 23484)
</span><span class="lines">@@ -26,8 +26,6 @@
</span><span class="cx"> #include "libbootstrap_public.h"
</span><span class="cx"> #include "launchd_runtime.h"
</span><span class="cx">
</span><del>-#define SHUTDOWN_LOG_DIR "/var/log/shutdown"
-
</del><span class="cx"> struct kevent;
</span><span class="cx"> struct conncb;
</span><span class="cx">
</span></span></pre></div>
<a id="trunklaunchdsrclaunchd_core_logicc"></a>
<div class="modfile"><h4>Modified: trunk/launchd/src/launchd_core_logic.c (23483 => 23484)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/launchd/src/launchd_core_logic.c 2008-01-15 00:51:21 UTC (rev 23483)
+++ trunk/launchd/src/launchd_core_logic.c 2008-01-16 20:56:12 UTC (rev 23484)
</span><span class="lines">@@ -96,6 +96,7 @@
</span><span class="cx"> #define LAUNCHD_DEFAULT_EXIT_TIMEOUT 20
</span><span class="cx"> #define LAUNCHD_SIGKILL_TIMER 5
</span><span class="cx">
</span><ins>+#define SHUTDOWN_LOG_DIR "/var/log/shutdown"
</ins><span class="cx">
</span><span class="cx"> #define TAKE_SUBSET_NAME "TakeSubsetName"
</span><span class="cx"> #define TAKE_SUBSET_PID "TakeSubsetPID"
</span><span class="lines">@@ -714,7 +715,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (do_apple_internal_logging() && jm->parentmgr == NULL && pid1_magic) {
</del><ins>+ if (do_apple_internal_logging && jm->parentmgr == NULL && pid1_magic) {
</ins><span class="cx"> runtime_set_timeout(still_alive_with_check, 5);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -4862,10 +4863,14 @@
</span><span class="cx"> int wstatus;
</span><span class="cx"> pid_t sp;
</span><span class="cx">
</span><del>- if (!do_apple_internal_logging()) {
</del><ins>+ if (!do_apple_internal_logging) {
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (!job_assumes(j, mkdir(SHUTDOWN_LOG_DIR, S_IRWXU) != -1 || errno == EEXIST)) {
+ return;
+ }
+
</ins><span class="cx"> snprintf(pidstr, sizeof(pidstr), "%u", j->p);
</span><span class="cx"> snprintf(logfile, sizeof(logfile), SHUTDOWN_LOG_DIR "/%s-%u.sample.txt", j->label, j->p);
</span><span class="cx">
</span></span></pre></div>
<a id="trunklaunchdsrclaunchd_runtimec"></a>
<div class="modfile"><h4>Modified: trunk/launchd/src/launchd_runtime.c (23483 => 23484)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/launchd/src/launchd_runtime.c 2008-01-15 00:51:21 UTC (rev 23483)
+++ trunk/launchd/src/launchd_runtime.c 2008-01-16 20:56:12 UTC (rev 23484)
</span><span class="lines">@@ -121,7 +121,9 @@
</span><span class="cx"> static sigset_t sigign_set;
</span><span class="cx"> static FILE *ourlogfile;
</span><span class="cx"> bool pid1_magic;
</span><ins>+bool do_apple_internal_logging;
</ins><span class="cx">
</span><ins>+
</ins><span class="cx"> INTERNAL_ABI mach_port_t
</span><span class="cx"> runtime_get_kernel_port(void)
</span><span class="cx"> {
</span><span class="lines">@@ -1145,7 +1147,7 @@
</span><span class="cx"> runtime_fsync(int fd)
</span><span class="cx"> {
</span><span class="cx"> #if 0
</span><del>- if (do_apple_internal_logging()) {
</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">@@ -1187,7 +1189,7 @@
</span><span class="cx"> char newmsg[10000];
</span><span class="cx">
</span><span class="cx"> if (attr->priority == LOG_APPLEONLY) {
</span><del>- if (do_apple_internal_logging()) {
</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">@@ -1552,19 +1554,6 @@
</span><span class="cx"> launchd_mport_deallocate(mhs);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-INTERNAL_ABI bool
-do_apple_internal_logging(void)
-{
- static int apple_internal_logging = 1;
- struct stat sb;
-
- if (unlikely(apple_internal_logging == 1)) {
- apple_internal_logging = stat("/AppleInternal", &sb);
- }
-
- return (apple_internal_logging == 0);
-}
-
</del><span class="cx"> INTERNAL_ABI int64_t
</span><span class="cx"> runtime_get_wall_time(void)
</span><span class="cx"> {
</span><span class="lines">@@ -1612,6 +1601,8 @@
</span><span class="cx"> void
</span><span class="cx"> do_file_init(void)
</span><span class="cx"> {
</span><ins>+ struct stat sb;
+
</ins><span class="cx"> launchd_assert(mach_timebase_info(&tbi) == 0);
</span><span class="cx"> tbi_float_val = tbi.numer;
</span><span class="cx"> tbi_float_val /= tbi.denom;
</span><span class="lines">@@ -1619,4 +1610,8 @@
</span><span class="cx"> if (getpid() == 1) {
</span><span class="cx"> pid1_magic = true;
</span><span class="cx"> }
</span><ins>+
+ if (stat("/AppleInternal", &sb) != -1) {
+ do_apple_internal_logging = true;
+ }
</ins><span class="cx"> }
</span></span></pre></div>
<a id="trunklaunchdsrclaunchd_runtimeh"></a>
<div class="modfile"><h4>Modified: trunk/launchd/src/launchd_runtime.h (23483 => 23484)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/launchd/src/launchd_runtime.h 2008-01-15 00:51:21 UTC (rev 23483)
+++ trunk/launchd/src/launchd_runtime.h 2008-01-16 20:56:12 UTC (rev 23484)
</span><span class="lines">@@ -104,6 +104,7 @@
</span><span class="cx"> typedef INTERNAL_ABI void (*timeout_callback)(void);
</span><span class="cx">
</span><span class="cx"> extern bool pid1_magic;
</span><ins>+extern bool do_apple_internal_logging;
</ins><span class="cx">
</span><span class="cx"> INTERNAL_ABI mach_port_t runtime_get_kernel_port(void);
</span><span class="cx">
</span><span class="lines">@@ -130,8 +131,6 @@
</span><span class="cx"> INTERNAL_ABI const char *reboot_flags_to_C_names(unsigned int flags);
</span><span class="cx"> INTERNAL_ABI const char *proc_flags_to_C_names(unsigned int flags);
</span><span class="cx">
</span><del>-INTERNAL_ABI bool do_apple_internal_logging(void);
-
</del><span class="cx"> INTERNAL_ABI int kevent_bulk_mod(struct kevent *kev, size_t kev_cnt);
</span><span class="cx"> INTERNAL_ABI int kevent_mod(uintptr_t ident, short filter, u_short flags, u_int fflags, intptr_t data, void *udata);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>