Changeset 23150

Timestamp:

03/14/07 09:38:43 (21 months ago)

Author:

zarzycki@…

Message:

Small logging changes.

Files:

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

trunk/launchd/src/launchd_core_logic.c

@@ -93 +93 @@
 #define LAUNCHD_ADVISABLE_IDLE_TIMEOUT 30
 #define LAUNCHD_DEFAULT_EXIT_TIMEOUT 20
-#define LAUNCHD_SIGKILL_TIMEOUT 5
+#define LAUNCHD_SIGKILL_TIMER 5
 
 extern char **environ;
@@ -1833 +1833 @@
 
         job_assumes(j, kevent_mod((uintptr_t)&j->exit_timeout, EVFILT_TIMER,
-                                EV_ADD, NOTE_SECONDS, LAUNCHD_SIGKILL_TIMEOUT, j) != -1);
+                                EV_ADD, NOTE_SECONDS, LAUNCHD_SIGKILL_TIMER, j) != -1);
 }
 
@@ -1870 +1870 @@
                         job_assumes(j, gettimeofday(&tve, NULL) != -1);
                         timersub(&tve, &j->sent_sigterm_time,  &tvd);
+                        tvd.tv_sec -= j->exit_timeout;
                         job_log(j, LOG_ERR, "Did not die after sending SIGKILL %lu seconds ago...", tvd.tv_sec);
                 } else {
@@ -3341 +3342 @@
                 pid_t p_i = kp[i].kp_proc.p_pid;
                 pid_t pp_i = kp[i].kp_eproc.e_ppid;
+                const char *z = kp[i].kp_proc.p_stat == SZOMB ? "zombie " : "";
+                const char *n = kp[i].kp_proc.p_comm;
 
                 if (p_i == 0 || p_i == 1) {
@@ -3346 +3349 @@
                 }
 
-                jobmgr_log(jm, LOG_WARNING, "Stray process at shutdown: PID %u PPID %u %s", p_i, pp_i, kp[i].kp_proc.p_comm);
+                jobmgr_log(jm, LOG_WARNING, "Stray %sprocess at shutdown: PID %u PPID %u %s", z, p_i, pp_i, n);
+
                 /*
                  * The kernel team requested that I not do this for Leopard.