<!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>[23376] trunk/launchd/src</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.macosforge.org/projects/launchd/changeset/23376">23376</a></dd>
<dt>Author</dt> <dd>zarzycki@apple.com</dd>
<dt>Date</dt> <dd>2007-09-12 17:48:46 -0700 (Wed, 12 Sep 2007)</dd>
</dl>
<h3>Log Message</h3>
<pre><rdar://problem/5475980> The per-user launchd needs to idle exit</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunklaunchdsrclaunchd_core_logicc">trunk/launchd/src/launchd_core_logic.c</a></li>
<li><a href="#trunklaunchdsrclaunchd_runtimec">trunk/launchd/src/launchd_runtime.c</a></li>
<li><a href="#trunklaunchdsrclaunchd_runtimeh">trunk/launchd/src/launchd_runtime.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunklaunchdsrclaunchd_core_logicc"></a>
<div class="modfile"><h4>Modified: trunk/launchd/src/launchd_core_logic.c (23375 => 23376)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/launchd/src/launchd_core_logic.c 2007-09-13 00:35:57 UTC (rev 23375)
+++ trunk/launchd/src/launchd_core_logic.c 2007-09-13 00:48:46 UTC (rev 23376)
</span><span class="lines">@@ -93,7 +93,6 @@
</span><span class="cx"> #include "job_reply.h"
</span><span class="cx">
</span><span class="cx"> #define LAUNCHD_MIN_JOB_RUN_TIME 10
</span><del>-#define LAUNCHD_ADVISABLE_IDLE_TIMEOUT 30
</del><span class="cx"> #define LAUNCHD_DEFAULT_EXIT_TIMEOUT 20
</span><span class="cx"> #define LAUNCHD_SIGKILL_TIMER 5
</span><span class="cx">
</span><span class="lines">@@ -450,7 +449,7 @@
</span><span class="cx"> static void do_file_init(void) __attribute__((constructor));
</span><span class="cx">
</span><span class="cx"> /* file local globals */
</span><del>-static unsigned int total_children;
</del><ins>+static size_t total_children;
</ins><span class="cx"> static mach_port_t the_exception_server;
</span><span class="cx"> static bool did_first_per_user_launchd_BootCache_hack;
</span><span class="cx"> static jobmgr_t background_jobmgr;
</span><span class="lines">@@ -646,7 +645,7 @@
</span><span class="cx"> static void
</span><span class="cx"> still_alive_with_check(void)
</span><span class="cx"> {
</span><del>- jobmgr_log(root_jobmgr, LOG_NOTICE, "Still alive with %u children.", total_children);
</del><ins>+ jobmgr_log(root_jobmgr, LOG_NOTICE, "Still alive with %lu children.", total_children);
</ins><span class="cx">
</span><span class="cx"> runtime_closelog(); /* hack to flush logs */
</span><span class="cx"> }
</span><span class="lines">@@ -740,6 +739,10 @@
</span><span class="cx"> struct mspolicy *msp;
</span><span class="cx"> struct envitem *ei;
</span><span class="cx">
</span><ins>+ if (j == workaround_5477111) {
+ job_log(j, LOG_NOTICE, "@@@@@ Tried to remove ahead of schedule!");
+ }
+
</ins><span class="cx"> if (j->p && j->anonymous) {
</span><span class="cx"> job_reap(j);
</span><span class="cx"> } else if (j->p) {
</span><span class="lines">@@ -837,6 +840,7 @@
</span><span class="cx"> free(j->j_binpref);
</span><span class="cx"> }
</span><span class="cx"> if (j->start_interval) {
</span><ins>+ runtime_del_ref();
</ins><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><span class="cx">
</span><span class="lines">@@ -1122,7 +1126,7 @@
</span><span class="cx"> j->kqjob_callback = job_callback;
</span><span class="cx"> j->mgr = jm;
</span><span class="cx"> j->min_run_time = LAUNCHD_MIN_JOB_RUN_TIME;
</span><del>- j->timeout = LAUNCHD_ADVISABLE_IDLE_TIMEOUT;
</del><ins>+ j->timeout = RUNTIME_ADVISABLE_IDLE_TIMEOUT;
</ins><span class="cx"> j->exit_timeout = LAUNCHD_DEFAULT_EXIT_TIMEOUT;
</span><span class="cx"> j->currently_ignored = true;
</span><span class="cx"> j->ondemand = true;
</span><span class="lines">@@ -1460,6 +1464,7 @@
</span><span class="cx"> if (value <= 0) {
</span><span class="cx"> job_log(j, LOG_WARNING, "StartInterval is not greater than zero, ignoring");
</span><span class="cx"> } else {
</span><ins>+ runtime_add_ref();
</ins><span class="cx"> j->start_interval = value;
</span><span class="cx"> }
</span><span class="cx"> if (-1 == kevent_mod((uintptr_t)&j->start_interval, EVFILT_TIMER, EV_ADD, NOTE_SECONDS, value, j)) {
</span><span class="lines">@@ -1950,6 +1955,9 @@
</span><span class="cx"> kevent_mod((uintptr_t)&j->exit_timeout, EVFILT_TIMER, EV_DELETE, 0, 0, NULL);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (!j->anonymous) {
+ runtime_del_ref();
+ }
</ins><span class="cx"> total_children--;
</span><span class="cx"> LIST_REMOVE(j, pid_hash_sle);
</span><span class="cx">
</span><span class="lines">@@ -2388,6 +2396,7 @@
</span><span class="cx">
</span><span class="cx"> j->start_pending = false;
</span><span class="cx">
</span><ins>+ runtime_add_ref();
</ins><span class="cx"> total_children++;
</span><span class="cx"> LIST_INSERT_HEAD(&j->mgr->active_jobs[ACTIVE_JOB_HASH(c)], j, pid_hash_sle);
</span><span class="cx">
</span><span class="lines">@@ -3262,6 +3271,8 @@
</span><span class="cx">
</span><span class="cx"> calendarinterval_setalarm(j, ci);
</span><span class="cx">
</span><ins>+ runtime_add_ref();
+
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -3272,6 +3283,8 @@
</span><span class="cx"> LIST_REMOVE(ci, global_sle);
</span><span class="cx">
</span><span class="cx"> free(ci);
</span><ins>+
+ runtime_del_ref();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void
</span><span class="lines">@@ -3329,6 +3342,8 @@
</span><span class="cx">
</span><span class="cx"> SLIST_INSERT_HEAD(&j->sockets, sg, sle);
</span><span class="cx">
</span><ins>+ runtime_add_ref();
+
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -3345,6 +3360,8 @@
</span><span class="cx">
</span><span class="cx"> free(sg->fds);
</span><span class="cx"> free(sg);
</span><ins>+
+ runtime_del_ref();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void
</span><span class="lines">@@ -3542,7 +3559,7 @@
</span><span class="cx"> job_log(j, LOG_DEBUG, "Exited while removal was pending.");
</span><span class="cx"> return true;
</span><span class="cx"> } else if (j->mgr->shutting_down) {
</span><del>- job_log(j, LOG_DEBUG, "Exited while shutdown in progress. Processes remaining: %u", total_children);
</del><ins>+ job_log(j, LOG_DEBUG, "Exited while shutdown in progress. Processes remaining: %lu", total_children);
</ins><span class="cx"> return true;
</span><span class="cx"> } else if (j->legacy_mach_job) {
</span><span class="cx"> if (SLIST_EMPTY(&j->machservices)) {
</span><span class="lines">@@ -4559,6 +4576,8 @@
</span><span class="cx">
</span><span class="cx"> SLIST_INSERT_HEAD(&j->semaphores, si, sle);
</span><span class="cx">
</span><ins>+ runtime_add_ref();
+
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -4572,6 +4591,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> free(si);
</span><ins>+
+ runtime_del_ref();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void
</span><span class="lines">@@ -5122,10 +5143,16 @@
</span><span class="cx"> break;
</span><span class="cx"> case VPROC_GSK_START_INTERVAL:
</span><span class="cx"> if ((unsigned int)inval > 0) {
</span><ins>+ if (j->start_interval == 0) {
+ runtime_add_ref();
+ }
</ins><span class="cx"> j->start_interval = inval;
</span><span class="cx"> job_assumes(j, kevent_mod((uintptr_t)&j->start_interval, EVFILT_TIMER, EV_ADD, NOTE_SECONDS, j->start_interval, j) != -1);
</span><span class="cx"> } else 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><ins>+ if (j->start_interval != 0) {
+ runtime_del_ref();
+ }
</ins><span class="cx"> j->start_interval = 0;
</span><span class="cx"> }
</span><span class="cx"> break;
</span></span></pre></div>
<a id="trunklaunchdsrclaunchd_runtimec"></a>
<div class="modfile"><h4>Modified: trunk/launchd/src/launchd_runtime.c (23375 => 23376)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/launchd/src/launchd_runtime.c 2007-09-13 00:35:57 UTC (rev 23375)
+++ trunk/launchd/src/launchd_runtime.c 2007-09-13 00:48:46 UTC (rev 23376)
</span><span class="lines">@@ -90,9 +90,10 @@
</span><span class="cx"> static mach_msg_size_t max_msg_size;
</span><span class="cx"> static mig_callback *mig_cb_table;
</span><span class="cx"> static size_t mig_cb_table_sz;
</span><del>-static timeout_callback runtime_idle_callback;
-static mach_msg_timeout_t runtime_idle_timeout;
</del><ins>+static timeout_callback runtime_idle_callback = launchd_shutdown;
+static mach_msg_timeout_t runtime_idle_timeout = RUNTIME_ADVISABLE_IDLE_TIMEOUT * 1000;
</ins><span class="cx"> static audit_token_t *au_tok;
</span><ins>+static size_t runtime_busy_cnt;
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> static STAILQ_HEAD(, logmsg_s) logmsg_queue = STAILQ_HEAD_INITIALIZER(logmsg_queue);
</span><span class="lines">@@ -635,15 +636,15 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> void
</span><del>-runtime_set_timeout(timeout_callback to_cb, mach_msg_timeout_t to)
</del><ins>+runtime_set_timeout(timeout_callback to_cb, unsigned int sec)
</ins><span class="cx"> {
</span><del>- if (to == 0 || to_cb == NULL) {
</del><ins>+ if (sec == 0 || to_cb == NULL) {
</ins><span class="cx"> runtime_idle_callback = NULL;
</span><span class="cx"> runtime_idle_timeout = 0;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> runtime_idle_callback = to_cb;
</span><del>- runtime_idle_timeout = to;
</del><ins>+ runtime_idle_timeout = sec * 1000;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> kern_return_t
</span><span class="lines">@@ -911,7 +912,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ((tmp_options & MACH_RCV_MSG) && runtime_idle_callback) {
</del><ins>+ if ((tmp_options & MACH_RCV_MSG) && runtime_idle_callback && (runtime_busy_cnt == 0)) {
</ins><span class="cx"> tmp_options |= MACH_RCV_TIMEOUT;
</span><span class="cx">
</span><span class="cx"> if (!(tmp_options & MACH_SEND_TIMEOUT)) {
</span><span class="lines">@@ -1349,3 +1350,15 @@
</span><span class="cx">
</span><span class="cx"> return runtime_log_pack(outval, outvalCnt);
</span><span class="cx"> }
</span><ins>+
+void
+runtime_add_ref(void)
+{
+ runtime_busy_cnt++;
+}
+
+void
+runtime_del_ref(void)
+{
+ runtime_busy_cnt--;
+}
</ins></span></pre></div>
<a id="trunklaunchdsrclaunchd_runtimeh"></a>
<div class="modfile"><h4>Modified: trunk/launchd/src/launchd_runtime.h (23375 => 23376)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/launchd/src/launchd_runtime.h 2007-09-13 00:35:57 UTC (rev 23375)
+++ trunk/launchd/src/launchd_runtime.h 2007-09-13 00:48:46 UTC (rev 23376)
</span><span class="lines">@@ -56,6 +56,9 @@
</span><span class="cx">
</span><span class="cx"> boolean_t launchd_internal_demux(mach_msg_header_t *Request, mach_msg_header_t *Reply);
</span><span class="cx">
</span><ins>+void runtime_add_ref(void);
+void runtime_del_ref(void);
+
</ins><span class="cx"> void launchd_runtime_init(void);
</span><span class="cx"> void launchd_runtime_init2(void);
</span><span class="cx"> void launchd_runtime(void) __attribute__((noreturn));
</span><span class="lines">@@ -63,7 +66,9 @@
</span><span class="cx"> int runtime_close(int fd);
</span><span class="cx"> int runtime_fsync(int fd);
</span><span class="cx">
</span><del>-void runtime_set_timeout(timeout_callback to_cb, mach_msg_timeout_t to);
</del><ins>+#define RUNTIME_ADVISABLE_IDLE_TIMEOUT 30
+
+void runtime_set_timeout(timeout_callback to_cb, unsigned int sec);
</ins><span class="cx"> kern_return_t runtime_add_mport(mach_port_t name, mig_callback demux, mach_msg_size_t msg_size);
</span><span class="cx"> kern_return_t runtime_remove_mport(mach_port_t name);
</span><span class="cx"> bool runtime_get_caller_creds(struct ldcred *ldc);
</span></span></pre>
</div>
</div>
</body>
</html>