<!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>[23379] trunk/launchd/src/launchd_core_logic.c</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.macosforge.org/projects/launchd/changeset/23379">23379</a></dd>
<dt>Author</dt> <dd>zarzycki@apple.com</dd>
<dt>Date</dt> <dd>2007-09-13 10:40:43 -0700 (Thu, 13 Sep 2007)</dd>
</dl>
<h3>Log Message</h3>
<pre>Smarter idle exit logic.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunklaunchdsrclaunchd_core_logicc">trunk/launchd/src/launchd_core_logic.c</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 (23378 => 23379)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/launchd/src/launchd_core_logic.c 2007-09-13 17:16:54 UTC (rev 23378)
+++ trunk/launchd/src/launchd_core_logic.c 2007-09-13 17:40:43 UTC (rev 23379)
</span><span class="lines">@@ -250,6 +250,7 @@
</span><span class="cx"> static void semaphoreitem_callback(job_t j, struct kevent *kev);
</span><span class="cx"> static void semaphoreitem_watch(job_t j, struct semaphoreitem *si);
</span><span class="cx"> static void semaphoreitem_ignore(job_t j, struct semaphoreitem *si);
</span><ins>+static void semaphoreitem_runtime_mod_ref(struct semaphoreitem *si, bool add);
</ins><span class="cx">
</span><span class="cx"> #define ACTIVE_JOB_HASH_SIZE 32
</span><span class="cx"> #define ACTIVE_JOB_HASH(x) (IS_POWER_OF_TWO(ACTIVE_JOB_HASH_SIZE) ? (x & (ACTIVE_JOB_HASH_SIZE - 1)) : (x % ACTIVE_JOB_HASH_SIZE))
</span><span class="lines">@@ -2329,6 +2330,11 @@
</span><span class="cx"> if (td < j->min_run_time && !j->legacy_mach_job && !j->inetcompat) {
</span><span class="cx"> time_t respawn_delta = j->min_run_time - td;
</span><span class="cx">
</span><ins>+ /*
+ * We technically should ref-count throttled jobs to prevent idle exit,
+ * but we're not directly tracking the 'throttled' state at the moment.
+ */
+
</ins><span class="cx"> job_log(j, LOG_WARNING, "Throttling respawn: Will start in %ld seconds", respawn_delta);
</span><span class="cx"> job_assumes(j, kevent_mod((uintptr_t)j, EVFILT_TIMER, EV_ADD|EV_ONESHOT, NOTE_SECONDS, respawn_delta, j) != -1);
</span><span class="cx"> job_ignore(j);
</span><span class="lines">@@ -4572,14 +4578,43 @@
</span><span class="cx">
</span><span class="cx"> SLIST_INSERT_HEAD(&j->semaphores, si, sle);
</span><span class="cx">
</span><del>- runtime_add_ref();
</del><ins>+ semaphoreitem_runtime_mod_ref(si, true);
</ins><span class="cx">
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void
</span><ins>+semaphoreitem_runtime_mod_ref(struct semaphoreitem *si, bool add)
+{
+ /*
+ * External events need to be tracked.
+ * Internal events do NOT need to be tracked.
+ */
+
+ switch (si->why) {
+ case SUCCESSFUL_EXIT:
+ case FAILED_EXIT:
+ case OTHER_JOB_ENABLED:
+ case OTHER_JOB_DISABLED:
+ case OTHER_JOB_ACTIVE:
+ case OTHER_JOB_INACTIVE:
+ return;
+ default:
+ break;
+ }
+
+ if (add) {
+ runtime_add_ref();
+ } else {
+ runtime_del_ref();
+ }
+}
+
+void
</ins><span class="cx"> semaphoreitem_delete(job_t j, struct semaphoreitem *si)
</span><span class="cx"> {
</span><ins>+ semaphoreitem_runtime_mod_ref(si, false);
+
</ins><span class="cx"> SLIST_REMOVE(&j->semaphores, si, semaphoreitem, sle);
</span><span class="cx">
</span><span class="cx"> if (si->fd != -1) {
</span><span class="lines">@@ -4587,8 +4622,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> free(si);
</span><del>-
- runtime_del_ref();
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void
</span></span></pre>
</div>
</div>
</body>
</html>