[launchd-changes] [23150] trunk/launchd/src/launchd_core_logic.c
source_changes at macosforge.org
source_changes at macosforge.org
Wed Mar 14 09:38:43 PDT 2007
Revision: 23150
http://trac.macosforge.org/projects/launchd/changeset/23150
Author: zarzycki at apple.com
Date: 2007-03-14 09:38:43 -0700 (Wed, 14 Mar 2007)
Log Message:
-----------
Small logging changes.
Modified Paths:
--------------
trunk/launchd/src/launchd_core_logic.c
Modified: trunk/launchd/src/launchd_core_logic.c
===================================================================
--- trunk/launchd/src/launchd_core_logic.c 2007-03-09 21:00:17 UTC (rev 23149)
+++ trunk/launchd/src/launchd_core_logic.c 2007-03-14 16:38:43 UTC (rev 23150)
@@ -92,7 +92,7 @@
#define LAUNCHD_MIN_JOB_RUN_TIME 10
#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;
@@ -1832,7 +1832,7 @@
j->sent_sigkill = true;
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);
}
void
@@ -1869,6 +1869,7 @@
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 {
job_force_sampletool(j);
@@ -3340,12 +3341,15 @@
for (i = 0; i < kp_cnt; i++) {
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) {
continue;
}
- 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.
* jobmgr_assumes(jm, kill(p_i, SIGKILL) != -1);
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/launchd-changes/attachments/20070314/badc9220/attachment.html
More information about the launchd-changes
mailing list