Changeset 23484

Timestamp:

01/16/08 12:56:12 (11 months ago)

Author:

zarzycki@…

Message:

A simple change.

Location:

trunk/launchd/src

Files:

• launchd.c (modified) (4 diffs)
• launchd.h (modified) (1 diff)
• launchd_core_logic.c (modified) (3 diffs)
• launchd_runtime.c (modified) (6 diffs)
• launchd_runtime.h (modified) (2 diffs)

trunk/launchd/src/launchd.c

@@ -78 +78 @@
 #define LAUNCHD_CONF ".launchd.conf"
 #define SECURITY_LIB "/System/Library/Frameworks/Security.framework/Versions/A/Security"
-#define SHUTDOWN_LOG_DIR "/var/log/shutdown"
 
 
@@ -94 +93 @@
 static void fatal_signal_handler(int sig, siginfo_t *si, void *uap);
 static void handle_pid1_crashes_separately(void);
-static void prep_shutdown_log_dir(void);
 
 static bool re_exec_in_single_user_mode;
@@ -237 +235 @@
 }
 
-void
-prep_shutdown_log_dir(void)
-{
-        launchd_assumes(mkdir(SHUTDOWN_LOG_DIR, S_IRWXU) != -1 || errno == EEXIST);
-}
-
 INTERNAL_ABI void
 launchd_shutdown(void)
@@ -260 +252 @@
                  */
                 runtime_setlogmask(LOG_UPTO(LOG_DEBUG));
-                prep_shutdown_log_dir();
         }
 

trunk/launchd/src/launchd.h

@@ -27 +27 @@
 #include "launchd_runtime.h"
 
-#define SHUTDOWN_LOG_DIR "/var/log/shutdown"
-
 struct kevent;
 struct conncb;

trunk/launchd/src/launchd_core_logic.c

@@ -97 +97 @@
 #define LAUNCHD_SIGKILL_TIMER 5
 
+#define SHUTDOWN_LOG_DIR "/var/log/shutdown"
 
 #define TAKE_SUBSET_NAME        "TakeSubsetName"
@@ -715 +716 @@
         }
 
-        if (do_apple_internal_logging() && jm->parentmgr == NULL && pid1_magic) {
+        if (do_apple_internal_logging && jm->parentmgr == NULL && pid1_magic) {
                 runtime_set_timeout(still_alive_with_check, 5);
         }
@@ -4863 +4864 @@
         pid_t sp;
 
-        if (!do_apple_internal_logging()) {
+        if (!do_apple_internal_logging) {
                 return;
         }
         
+        if (!job_assumes(j, mkdir(SHUTDOWN_LOG_DIR, S_IRWXU) != -1 || errno == EEXIST)) {
+                return;
+        }
+
         snprintf(pidstr, sizeof(pidstr), "%u", j->p);
         snprintf(logfile, sizeof(logfile), SHUTDOWN_LOG_DIR "/%s-%u.sample.txt", j->label, j->p);

trunk/launchd/src/launchd_runtime.c

@@ -122 +122 @@
 static FILE *ourlogfile;
 bool pid1_magic;
+bool do_apple_internal_logging;
+
 
 INTERNAL_ABI mach_port_t
@@ -1146 +1148 @@
 {
 #if 0
-        if (do_apple_internal_logging()) {
+        if (do_apple_internal_logging) {
                 return fcntl(fd, F_FULLFSYNC, NULL);
         } else {
@@ -1188 +1190 @@
 
         if (attr->priority == LOG_APPLEONLY) {
-                if (do_apple_internal_logging()) {
+                if (do_apple_internal_logging) {
                         attr->priority = LOG_NOTICE;
                 } else {
@@ -1553 +1555 @@
 }
 
-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);
-}
-
 INTERNAL_ABI int64_t
 runtime_get_wall_time(void)
@@ -1613 +1602 @@
 do_file_init(void)
 {
+        struct stat sb;
+
         launchd_assert(mach_timebase_info(&tbi) == 0);
         tbi_float_val = tbi.numer;
@@ -1620 +1611 @@
                 pid1_magic = true;
         }
-}
+
+        if (stat("/AppleInternal", &sb) != -1) {
+                do_apple_internal_logging = true;
+        }
+}

trunk/launchd/src/launchd_runtime.h

@@ -105 +105 @@
 
 extern bool pid1_magic;
+extern bool do_apple_internal_logging;
 
 INTERNAL_ABI mach_port_t runtime_get_kernel_port(void);
@@ -130 +131 @@
 INTERNAL_ABI const char *reboot_flags_to_C_names(unsigned int flags);
 INTERNAL_ABI const char *proc_flags_to_C_names(unsigned int flags);
-
-INTERNAL_ABI bool do_apple_internal_logging(void);
 
 INTERNAL_ABI int kevent_bulk_mod(struct kevent *kev, size_t kev_cnt);