Changeset 23466

Timestamp:

12/12/07 16:16:27 (12 months ago)

Author:

zarzycki@…

Message:

Misc logging updates.

Location:

trunk/launchd/src

Files:

• launchd.c (modified) (4 diffs)
• launchd.h (modified) (1 diff)
• launchd_core_logic.c (modified) (7 diffs)
• launchd_runtime.c (modified) (4 diffs)
• launchd_runtime.h (modified) (1 diff)

trunk/launchd/src/launchd.c

@@ -100 +100 @@
 static pid_t crash_pid;
 
-static bool shutdown_in_progress = false;
-bool debug_shutdown_hangs = false;
+bool shutdown_in_progress = false;
 bool network_up = false;
 
@@ -247 +246 @@
 {
         struct timeval tvnow;
-        struct stat sb;
 
         if (shutdown_in_progress) {
@@ -255 +253 @@
         shutdown_in_progress = true;
 
-        if (getpid() == 1 && stat("/var/db/debugShutdownHangs", &sb) != -1) {
+        if (getpid() == 1) {
                 /*
                  * When this changes to a more sustainable API, update this:
@@ -262 +260 @@
                 runtime_setlogmask(LOG_UPTO(LOG_DEBUG));
                 prep_shutdown_log_dir();
-                debug_shutdown_hangs = true;
         }
 

trunk/launchd/src/launchd.h

@@ -32 +32 @@
 struct conncb;
 
-extern bool debug_shutdown_hangs;
+extern bool shutdown_in_progress;
 extern bool network_up;
 

trunk/launchd/src/launchd_core_logic.c

@@ -711 +711 @@
         }
 
-        if (debug_shutdown_hangs && jm->parentmgr == NULL && getpid() == 1) {
+        if (do_apple_internal_logging() && jm->parentmgr == NULL && getpid() == 1) {
                 runtime_set_timeout(still_alive_with_check, 5);
         }
@@ -4295 +4295 @@
 {
         int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_ALL };
-        size_t i, kp_cnt, len = 10*1024*1024;
+        size_t i, kp_cnt = 0, kp_skipped = 0, len = 10*1024*1024;
         struct kinfo_proc *kp;
 
@@ -4319 +4319 @@
 
                 if (p_i == 0 || p_i == 1) {
+                        kp_skipped++;
                         continue;
                 }
@@ -4331 +4332 @@
 
 out:
+        if (kp_cnt == kp_skipped) {
+                jobmgr_log(jm, LOG_DEBUG, "No stray processes at shutdown");
+        }
+
         free(kp);
 }
@@ -4767 +4772 @@
         pid_t sp;
 
-        if (!debug_shutdown_hangs) {
+        if (!do_apple_internal_logging()) {
                 return;
         }
@@ -6703 +6708 @@
 {
         struct statfs buf[250];
-        int i, found, returned;
+        int r, i, found, returned;
 
         do {
@@ -6721 +6726 @@
                         }
 
-                        runtime_syslog(LOG_DEBUG, "About to unmount: %s", buf[i].f_mntonname);
-                        if (launchd_assumes(unmount(buf[i].f_mntonname, 0) != -1)) {
+                        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) {
                                 found++;
                         }

trunk/launchd/src/launchd_runtime.c

@@ -1132 +1132 @@
 runtime_fsync(int fd)
 {
-        if (debug_shutdown_hangs) {
+        if (do_apple_internal_logging()) {
                 return fcntl(fd, F_FULLFSYNC, NULL);
         } else {
@@ -1170 +1170 @@
         static struct timeval shutdown_start;
         static struct timeval prev_msg;
-        static int apple_internal_logging = 1;
         struct timeval tvnow, tvd_total, tvd_msg_delta = { 0, 0 };
-        struct stat sb;
         int saved_errno = errno;
         char newmsg[10000];
         size_t i, j;
 
-        if (apple_internal_logging == 1) {
-                apple_internal_logging = stat("/AppleInternal", &sb);
-        }
-
         if (attr->priority == LOG_APPLEONLY) {
-                if (apple_internal_logging == 0) {
+                if (do_apple_internal_logging()) {
                         attr->priority = LOG_NOTICE;
                 } else {
@@ -1193 +1187 @@
         }
 
-        if (!(debug_shutdown_hangs && getpid() == 1)) {
+        if (getpid() != 1 || !shutdown_in_progress) {
                 vsnprintf(newmsg, sizeof(newmsg), message, args);
                 logmsg_add(attr, saved_errno, newmsg);
@@ -1568 +1562 @@
         launchd_mport_deallocate(mhs);
 }
+
+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);
+}

trunk/launchd/src/launchd_runtime.h

@@ -124 +124 @@
 const char *proc_flags_to_C_names(unsigned int flags);
 
+bool do_apple_internal_logging(void);
 
 int kevent_bulk_mod(struct kevent *kev, size_t kev_cnt);