Changeset 23594

Timestamp:

2008-04-08 13:38:15 (5 months ago)

Author:

zarzycki@…

Message:

Better logging at shutdown.

Files:

• trunk/launchd/src/launchd_core_logic.c (modified) (7 diffs)

trunk/launchd/src/launchd_core_logic.c

@@ -309 +309 @@
 static void jobmgr_reap_bulk(jobmgr_t jm, struct kevent *kev);
 static void jobmgr_log_stray_children(jobmgr_t jm);
+static void jobmgr_kill_stray_child(jobmgr_t jm, pid_t p);
 static void jobmgr_remove(jobmgr_t jm);
 static void jobmgr_dispatch_all(jobmgr_t jm, bool newmounthack);
@@ -596 +597 @@
                         job_assumes(j, kevent_mod((uintptr_t)&j->exit_timeout, EVFILT_TIMER,
                                                 EV_ADD|EV_ONESHOT, NOTE_SECONDS, j->exit_timeout, j) != -1);
+                } else {
+                        job_log(j, LOG_DEBUG, "This job has an infinite exit timeout");
                 }
 
@@ -2194 +2197 @@
         struct kinfo_proc *kp;
 
-#if TARGET_OS_EMBEDDED
         if (!do_apple_internal_logging) {
                 return;
         }
-#endif
 
         runtime_ktrace(RTKT_LAUNCHD_FINDING_STRAY_PG, j->p, 0, 0);
@@ -3064 +3065 @@
         uid_t u = j->mach_uid;
 
-#if TARGET_OS_EMBEDDED
         if (!do_apple_internal_logging) {
                 return;
         }
-#endif
+
         kp = malloc(len);
 
@@ -4630 +4630 @@
 
 void
+jobmgr_kill_stray_child(jobmgr_t jm, pid_t p)
+{
+        struct timespec ts = { 2, 0 };
+        uint64_t start, end, nanosec;
+        struct kevent kev;
+        int r, kq = kqueue();
+
+        if (!jobmgr_assumes(jm, kq != -1)) {
+                return;
+        }
+
+        EV_SET(&kev, p, EVFILT_PROC, EV_ADD, 0, 0, 0);
+
+        if (!jobmgr_assumes(jm, kevent(kq, &kev, 1, NULL, 0, NULL) != -1)) {
+                goto out;
+        }
+
+        start = runtime_get_opaque_time();
+
+        if (!jobmgr_assumes(jm, runtime_kill(p, SIGTERM) != -1)) {
+                goto out;
+        }
+
+        r = kevent(kq, NULL, 0, &kev, 1, &ts);
+
+        if (!jobmgr_assumes(jm, r == 0 || r == 1)) {
+                goto out;
+        }
+
+        if (r == 0 && jobmgr_assumes(jm, runtime_kill(p, SIGKILL) != -1)) {
+                jobmgr_assumes(jm, kevent(kq, NULL, 0, &kev, 1, NULL) == 1);
+        }
+
+        end = runtime_get_opaque_time();
+
+        nanosec = runtime_opaque_time_to_nano(end - start);
+
+        jobmgr_log(jm, LOG_DEBUG, "PID %u died after %llu nanoseconds", p, nanosec);
+
+out:
+        jobmgr_assumes(jm, runtime_close(kq) != -1);
+}
+
+void
 jobmgr_log_stray_children(jobmgr_t jm)
 {
@@ -4636 +4680 @@
         struct kinfo_proc *kp;
 
-#if TARGET_OS_EMBEDDED
         if (!do_apple_internal_logging) {
                 return;
         }
-#endif
 
         if (likely(jm->parentmgr || !pid1_magic)) {
@@ -4672 +4714 @@
                 jobmgr_log(jm, LOG_WARNING, "Stray %sprocess at shutdown: PID %u PPID %u PGID %u %s", z, p_i, pp_i, pg_i, n);
 
-                /*
-                 * The kernel team requested that launchd not do this for Leopard.
-                 * jobmgr_assumes(jm, runtime_kill(p_i, SIGKILL) != -1);
-                 */
+                jobmgr_kill_stray_child(jm, p_i);
         }