<!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>[23154] trunk/launchd/src</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.macosforge.org/projects/launchd/changeset/23154">23154</a></dd>
<dt>Author</dt> <dd>zarzycki@apple.com</dd>
<dt>Date</dt> <dd>2007-03-19 11:26:21 -0700 (Mon, 19 Mar 2007)</dd>
</dl>
<h3>Log Message</h3>
<pre><rdar://problem/5071550> launchd needs exec on disk mount option</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="#trunklaunchdsrclaunchd_runtimec">trunk/launchd/src/launchd_runtime.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 (23153 => 23154)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/launchd/src/launchd.plist.5 2007-03-19 17:49:43 UTC (rev 23153)
+++ trunk/launchd/src/launchd.plist.5 2007-03-19 18:26:21 UTC (rev 23154)
</span><span class="lines">@@ -195,6 +195,8 @@
</span><span class="cx"> This optional key causes the job to be started if any one of the listed paths are modified.
</span><span class="cx"> .It Sy QueueDirectories <array of strings>
</span><span class="cx"> Much like the WatchPaths option, this key will watch the paths for modifications. The difference being that the job will only be started if the path is a directory and the directory is not empty.
</span><ins>+.It Sy StartOnMount <boolean>
+This optional key causes the job to be started every time a filesystem is mounted.
</ins><span class="cx"> .It Sy StartInterval <integer>
</span><span class="cx"> This optional key causes the job to be started every N seconds.
</span><span class="cx"> If the system is asleep, the job will be started the next time the computer
</span></span></pre></div>
<a id="trunklaunchdsrclaunchd_core_logicc"></a>
<div class="modfile"><h4>Modified: trunk/launchd/src/launchd_core_logic.c (23153 => 23154)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/launchd/src/launchd_core_logic.c 2007-03-19 17:49:43 UTC (rev 23153)
+++ trunk/launchd/src/launchd_core_logic.c 2007-03-19 18:26:21 UTC (rev 23154)
</span><span class="lines">@@ -222,7 +222,7 @@
</span><span class="cx"> static bool jobmgr_is_idle(jobmgr_t jm);
</span><span class="cx"> static void jobmgr_log_stray_children(jobmgr_t jm);
</span><span class="cx"> static void jobmgr_remove(jobmgr_t jm);
</span><del>-static void jobmgr_dispatch_all(jobmgr_t jm);
</del><ins>+static void jobmgr_dispatch_all(jobmgr_t jm, bool newmounthack);
</ins><span class="cx"> static job_t job_mig_intran2(jobmgr_t jm, mach_port_t p);
</span><span class="cx"> static void job_export_all2(jobmgr_t jm, launch_data_t where);
</span><span class="cx"> static void jobmgr_callback(void *obj, struct kevent *kev);
</span><span class="lines">@@ -278,7 +278,7 @@
</span><span class="cx"> mode_t mask;
</span><span class="cx"> unsigned int globargv:1, wait4debugger:1, unload_at_exit:1, stall_before_exec:1, only_once:1,
</span><span class="cx"> currently_ignored:1, forced_peers_to_demand_mode:1, setnice:1, hopefully_exits_last:1, removal_pending:1,
</span><del>- wait4pipe_eof:1, sent_sigkill:1, debug_before_kill:1, weird_bootstrap:1;
</del><ins>+ wait4pipe_eof:1, sent_sigkill:1, debug_before_kill:1, weird_bootstrap:1, start_on_mount:1;
</ins><span class="cx"> char label[0];
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -766,7 +766,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (j->mgr->global_on_demand_cnt == 0) {
</span><del>- jobmgr_dispatch_all(j->mgr);
</del><ins>+ jobmgr_dispatch_all(j->mgr, false);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return true;
</span><span class="lines">@@ -1089,6 +1089,8 @@
</span><span class="cx"> case 'S':
</span><span class="cx"> if (strcasecmp(key, LAUNCH_JOBKEY_SESSIONCREATE) == 0) {
</span><span class="cx"> j->session_create = value;
</span><ins>+ } else if (strcasecmp(key, LAUNCH_JOBKEY_STARTONMOUNT) == 0) {
+ j->start_on_mount = value;
</ins><span class="cx"> }
</span><span class="cx"> break;
</span><span class="cx"> case 'l':
</span><span class="lines">@@ -1751,17 +1753,17 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void
</span><del>-jobmgr_dispatch_all(jobmgr_t jm)
</del><ins>+jobmgr_dispatch_all(jobmgr_t jm, bool newmounthack)
</ins><span class="cx"> {
</span><span class="cx"> jobmgr_t jmi, jmn;
</span><span class="cx"> job_t ji, jn;
</span><span class="cx">
</span><span class="cx"> SLIST_FOREACH_SAFE(jmi, &jm->submgrs, sle, jmn) {
</span><del>- jobmgr_dispatch_all(jmi);
</del><ins>+ jobmgr_dispatch_all(jmi, newmounthack);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> SLIST_FOREACH_SAFE(ji, &jm->jobs, sle, jn) {
</span><del>- job_dispatch(ji, false);
</del><ins>+ job_dispatch(ji, newmounthack ? ji->start_on_mount : false);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1909,6 +1911,12 @@
</span><span class="cx"> return (void)jobmgr_assumes(jm, false);
</span><span class="cx"> }
</span><span class="cx"> break;
</span><ins>+ case EVFILT_FS:
+ if (kev->fflags & VQ_MOUNT) {
+ jobmgr_dispatch_all(jm, true);
+ }
+ jobmgr_dispatch_all_semaphores(jm);
+ break;
</ins><span class="cx"> case EVFILT_TIMER:
</span><span class="cx"> jobmgr_log(jm, LOG_NOTICE, "Still alive with %u children.", total_children);
</span><span class="cx"> break;
</span><span class="lines">@@ -3503,6 +3511,7 @@
</span><span class="cx">
</span><span class="cx"> if (!jm) {
</span><span class="cx"> jobmgr_assumes(jmr, kevent_mod(SIGTERM, EVFILT_SIGNAL, EV_ADD, 0, 0, jmr) != -1);
</span><ins>+ jobmgr_assumes(jmr, kevent_mod(0, EVFILT_FS, EV_ADD|EV_CLEAR, VQ_MOUNT|VQ_UNMOUNT|VQ_UPDATE, 0, jmr) != -1);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (name) {
</span></span></pre></div>
<a id="trunklaunchdsrclaunchd_runtimec"></a>
<div class="modfile"><h4>Modified: trunk/launchd/src/launchd_runtime.c (23153 => 23154)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/launchd/src/launchd_runtime.c 2007-03-19 17:49:43 UTC (rev 23153)
+++ trunk/launchd/src/launchd_runtime.c 2007-03-19 18:26:21 UTC (rev 23154)
</span><span class="lines">@@ -42,6 +42,7 @@
</span><span class="cx"> #include <sys/socket.h>
</span><span class="cx"> #include <sys/mount.h>
</span><span class="cx"> #include <sys/reboot.h>
</span><ins>+#include <sys/fcntl.h>
</ins><span class="cx"> #include <bsm/libbsm.h>
</span><span class="cx"> #include <malloc/malloc.h>
</span><span class="cx"> #include <unistd.h>
</span><span class="lines">@@ -888,6 +889,15 @@
</span><span class="cx">
</span><span class="cx"> record_caller_creds(&bufRequest->Head);
</span><span class="cx">
</span><ins>+ /*
+ * This is a total hack. We really need a bit in the kernel's proc
+ * struct to declare our intent.
+ */
+ static int no_hang_fd = -1;
+ if (no_hang_fd == -1) {
+ no_hang_fd = _fd(open("/dev/autofs_nowait", 0));
+ }
+
</ins><span class="cx"> if (the_demux(&bufRequest->Head, &bufReply->Head) == FALSE) {
</span><span class="cx"> /* XXX - also gross */
</span><span class="cx"> if (bufRequest->Head.msgh_id == MACH_NOTIFY_NO_SENDERS) {
</span></span></pre></div>
<a id="trunklaunchdsrcliblaunch_publich"></a>
<div class="modfile"><h4>Modified: trunk/launchd/src/liblaunch_public.h (23153 => 23154)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/launchd/src/liblaunch_public.h 2007-03-19 17:49:43 UTC (rev 23153)
+++ trunk/launchd/src/liblaunch_public.h 2007-03-19 18:26:21 UTC (rev 23154)
</span><span class="lines">@@ -81,6 +81,7 @@
</span><span class="cx"> #define LAUNCH_JOBKEY_HOPEFULLYEXITSLAST "HopefullyExitsLast"
</span><span class="cx"> #define LAUNCH_JOBKEY_LOWPRIORITYIO "LowPriorityIO"
</span><span class="cx"> #define LAUNCH_JOBKEY_SESSIONCREATE "SessionCreate"
</span><ins>+#define LAUNCH_JOBKEY_STARTONMOUNT "StartOnMount"
</ins><span class="cx"> #define LAUNCH_JOBKEY_SOFTRESOURCELIMITS "SoftResourceLimits"
</span><span class="cx"> #define LAUNCH_JOBKEY_HARDRESOURCELIMITS "HardResourceLimits"
</span><span class="cx"> #define LAUNCH_JOBKEY_STANDARDOUTPATH "StandardOutPath"
</span></span></pre>
</div>
</div>
</body>
</html>