<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[23040] trunk/launchd/src</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.macosforge.org/projects/launchd/changeset/23040">23040</a></dd>
<dt>Author</dt> <dd>zarzycki@apple.com</dd>
<dt>Date</dt> <dd>2007-02-07 15:39:58 -0800 (Wed, 07 Feb 2007)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add a per job exit timeout.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunklaunchdsrclaunchdplist5">trunk/launchd/src/launchd.plist.5</a></li>
<li><a href="#trunklaunchdsrclaunchd_core_logicc">trunk/launchd/src/launchd_core_logic.c</a></li>
<li><a href="#trunklaunchdsrcliblaunch_publich">trunk/launchd/src/liblaunch_public.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunklaunchdsrclaunchdplist5"></a>
<div class="modfile"><h4>Modified: trunk/launchd/src/launchd.plist.5 (23039 => 23040)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/launchd/src/launchd.plist.5 2007-02-07 21:07:49 UTC (rev 23039)
+++ trunk/launchd/src/launchd.plist.5 2007-02-07 23:39:58 UTC (rev 23040)
</span><span class="lines">@@ -176,6 +176,10 @@
</span><span class="cx"> The recommended idle time out (in seconds) to pass to the job. If no value is specified, a default time out will be supplied by
</span><span class="cx"> .Nm launchd
</span><span class="cx"> for use by the job at check in time.
</span><ins>+.It Sy ExitTimeOut <integer>
+The amount of time
+.Nm launchd
+waits before sending a SIGKILL signal. The default value is 20 seconds. The value zero is interpreted as infinity.
</ins><span class="cx"> .It Sy ThrottleInterval <integer>
</span><span class="cx"> This key lets one override the default throttling policy imposed on jobs by
</span><span class="cx"> .Nm launchd .
</span></span></pre></div>
<a id="trunklaunchdsrclaunchd_core_logicc"></a>
<div class="modfile"><h4>Modified: trunk/launchd/src/launchd_core_logic.c (23039 => 23040)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/launchd/src/launchd_core_logic.c 2007-02-07 21:07:49 UTC (rev 23039)
+++ trunk/launchd/src/launchd_core_logic.c 2007-02-07 23:39:58 UTC (rev 23040)
</span><span class="lines">@@ -87,6 +87,7 @@
</span><span class="cx">
</span><span class="cx"> #define LAUNCHD_MIN_JOB_RUN_TIME 10
</span><span class="cx"> #define LAUNCHD_ADVISABLE_IDLE_TIMEOUT 30
</span><ins>+#define LAUNCHD_DEFAULT_EXIT_TIMEOUT 20
</ins><span class="cx">
</span><span class="cx"> extern char **environ;
</span><span class="cx">
</span><span class="lines">@@ -254,8 +255,10 @@
</span><span class="cx"> int forkfd;
</span><span class="cx"> int log_redirect_fd;
</span><span class="cx"> int nice;
</span><del>- int timeout;
</del><ins>+ unsigned int timeout;
+ unsigned int exit_timeout;
</ins><span class="cx"> int stdout_err_fd;
</span><ins>+ struct timeval sent_sigterm_time;
</ins><span class="cx"> time_t start_time;
</span><span class="cx"> time_t min_run_time;
</span><span class="cx"> unsigned int start_interval;
</span><span class="lines">@@ -405,6 +408,11 @@
</span><span class="cx"> {
</span><span class="cx"> if (j->p) {
</span><span class="cx"> job_assumes(j, kill(j->p, SIGTERM) != -1);
</span><ins>+ job_assumes(j, gettimeofday(&j->sent_sigterm_time, NULL) != -1);
+ if (j->exit_timeout) {
+ job_assumes(j, kevent_mod((uintptr_t)&j->exit_timeout, EVFILT_TIMER,
+ EV_ADD|EV_ONESHOT, NOTE_SECONDS, j->exit_timeout, j) != -1);
+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -516,9 +524,6 @@
</span><span class="cx"> if (!job_active(ji)) {
</span><span class="cx"> job_remove(ji);
</span><span class="cx"> } else {
</span><del>- if (debug_shutdown_hangs) {
- job_assumes(ji, kevent_mod((uintptr_t)ji, EVFILT_TIMER, EV_ADD|EV_ONESHOT, NOTE_SECONDS, 8, ji) != -1);
- }
</del><span class="cx"> job_stop(ji);
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -662,6 +667,9 @@
</span><span class="cx"> if (j->start_interval) {
</span><span class="cx"> job_assumes(j, kevent_mod((uintptr_t)&j->start_interval, EVFILT_TIMER, EV_DELETE, 0, 0, NULL) != -1);
</span><span class="cx"> }
</span><ins>+ if (j->exit_timeout) {
+ kevent_mod((uintptr_t)&j->exit_timeout, EVFILT_TIMER, EV_DELETE, 0, 0, NULL);
+ }
</ins><span class="cx">
</span><span class="cx"> kevent_mod((uintptr_t)j, EVFILT_TIMER, EV_DELETE, 0, 0, NULL);
</span><span class="cx"> free(j);
</span><span class="lines">@@ -907,6 +915,7 @@
</span><span class="cx"> j->mgr = jm;
</span><span class="cx"> j->min_run_time = LAUNCHD_MIN_JOB_RUN_TIME;
</span><span class="cx"> j->timeout = LAUNCHD_ADVISABLE_IDLE_TIMEOUT;
</span><ins>+ j->exit_timeout = LAUNCHD_DEFAULT_EXIT_TIMEOUT;
</ins><span class="cx"> j->currently_ignored = true;
</span><span class="cx"> j->ondemand = true;
</span><span class="cx"> j->checkedin = true;
</span><span class="lines">@@ -1162,6 +1171,16 @@
</span><span class="cx"> job_import_integer(job_t j, const char *key, long long value)
</span><span class="cx"> {
</span><span class="cx"> switch (key[0]) {
</span><ins>+ case 'e':
+ case 'E':
+ if (strcasecmp(key, LAUNCH_JOBKEY_EXITTIMEOUT) == 0) {
+ if (value < 0) {
+ job_log(j, LOG_WARNING, "Exit timeout less zero. Ignoring.");
+ } else {
+ j->exit_timeout = value;
+ }
+ }
+ break;
</ins><span class="cx"> case 'n':
</span><span class="cx"> case 'N':
</span><span class="cx"> if (strcasecmp(key, LAUNCH_JOBKEY_NICE) == 0) {
</span><span class="lines">@@ -1577,6 +1596,7 @@
</span><span class="cx"> void
</span><span class="cx"> job_reap(job_t j)
</span><span class="cx"> {
</span><ins>+ struct timeval tve, tvd;
</ins><span class="cx"> struct rusage ru;
</span><span class="cx"> int status;
</span><span class="cx">
</span><span class="lines">@@ -1596,12 +1616,24 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ job_assumes(j, gettimeofday(&tve, NULL) != -1);
+
</ins><span class="cx"> if (j->wait_reply_port) {
</span><span class="cx"> job_log(j, LOG_DEBUG, "MPM wait reply being sent");
</span><span class="cx"> job_assumes(j, job_mig_wait_reply(j->wait_reply_port, 0, status) == 0);
</span><span class="cx"> j->wait_reply_port = MACH_PORT_NULL;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (j->sent_sigterm_time.tv_sec) {
+ double delta;
+
+ timersub(&tve, &j->sent_sigterm_time, &tvd);
+
+ delta = (double)tvd.tv_sec + (double)tvd.tv_usec / (double)1000000;
+
+ job_log(j, tvd.tv_sec ? LOG_NOTICE : LOG_INFO, "Exited %f seconds after SIGTERM was sent", delta);
+ }
+
</ins><span class="cx"> timeradd(&ru.ru_utime, &j->ru.ru_utime, &j->ru.ru_utime);
</span><span class="cx"> timeradd(&ru.ru_stime, &j->ru.ru_stime, &j->ru.ru_stime);
</span><span class="cx"> j->ru.ru_maxrss += ru.ru_maxrss;
</span><span class="lines">@@ -1724,14 +1756,14 @@
</span><span class="cx"> }
</span><span class="cx"> break;
</span><span class="cx"> case EVFILT_TIMER:
</span><del>- if ((uintptr_t)j == kev->ident) {
- if (j->p && job_assumes(j, debug_shutdown_hangs)) {
</del><ins>+ if ((uintptr_t)j == kev->ident || (uintptr_t)&j->start_interval == kev->ident) {
+ job_dispatch(j, true);
+ } else if ((uintptr_t)&j->exit_timeout == kev->ident) {
+ if (debug_shutdown_hangs) {
</ins><span class="cx"> job_force_sampletool(j);
</span><del>- } else {
- job_dispatch(j, true);
</del><span class="cx"> }
</span><del>- } else if ((uintptr_t)&j->start_interval == kev->ident) {
- job_dispatch(j, true);
</del><ins>+ job_log(j, LOG_WARNING, "Exit timeout elapsed (%u seconds). Killing.", j->exit_timeout);
+ job_assumes(j, kill(j->p, SIGKILL) != -1);
</ins><span class="cx"> } else {
</span><span class="cx"> calendarinterval_callback(j, kev);
</span><span class="cx"> }
</span><span class="lines">@@ -1788,6 +1820,9 @@
</span><span class="cx">
</span><span class="cx"> job_log(j, LOG_DEBUG, "Starting");
</span><span class="cx">
</span><ins>+ j->sent_sigterm_time.tv_sec = 0;
+ j->sent_sigterm_time.tv_usec = 0;
+
</ins><span class="cx"> /* FIXME, using stdinpath is a hack for re-reading the conf file */
</span><span class="cx"> if (j->stdinpath) {
</span><span class="cx"> sipc = true;
</span></span></pre></div>
<a id="trunklaunchdsrcliblaunch_publich"></a>
<div class="modfile"><h4>Modified: trunk/launchd/src/liblaunch_public.h (23039 => 23040)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/launchd/src/liblaunch_public.h 2007-02-07 21:07:49 UTC (rev 23039)
+++ trunk/launchd/src/liblaunch_public.h 2007-02-07 23:39:58 UTC (rev 23040)
</span><span class="lines">@@ -58,6 +58,7 @@
</span><span class="cx"> #define LAUNCH_JOBKEY_USERNAME "UserName"
</span><span class="cx"> #define LAUNCH_JOBKEY_GROUPNAME "GroupName"
</span><span class="cx"> #define LAUNCH_JOBKEY_TIMEOUT "TimeOut"
</span><ins>+#define LAUNCH_JOBKEY_EXITTIMEOUT "ExitTimeOut"
</ins><span class="cx"> #define LAUNCH_JOBKEY_INITGROUPS "InitGroups"
</span><span class="cx"> #define LAUNCH_JOBKEY_SOCKETS "Sockets"
</span><span class="cx"> #define LAUNCH_JOBKEY_MACHSERVICES "MachServices"
</span></span></pre>
</div>
</div>
</body>
</html>