<!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>[23304] trunk/launchd/src</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.macosforge.org/projects/launchd/changeset/23304">23304</a></dd>
<dt>Author</dt> <dd>zarzycki@apple.com</dd>
<dt>Date</dt> <dd>2007-07-11 15:11:37 -0700 (Wed, 11 Jul 2007)</dd>
</dl>
<h3>Log Message</h3>
<pre><rdar://problem/5194957> launchctl unload should block until unload is complete</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunklaunchdsrclaunchctlc">trunk/launchd/src/launchctl.c</a></li>
<li><a href="#trunklaunchdsrclaunchd_core_logicc">trunk/launchd/src/launchd_core_logic.c</a></li>
<li><a href="#trunklaunchdsrclibvproc_privateh">trunk/launchd/src/libvproc_private.h</a></li>
<li><a href="#trunklaunchdsrcprotocol_jobdefs">trunk/launchd/src/protocol_job.defs</a></li>
<li><a href="#trunklaunchdsrcprotocol_job_replydefs">trunk/launchd/src/protocol_job_reply.defs</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunklaunchdsrclaunchctlc"></a>
<div class="modfile"><h4>Modified: trunk/launchd/src/launchctl.c (23303 => 23304)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/launchd/src/launchctl.c 2007-07-11 18:10:33 UTC (rev 23303)
+++ trunk/launchd/src/launchctl.c 2007-07-11 22:11:37 UTC (rev 23304)
</span><span class="lines">@@ -440,11 +440,8 @@
</span><span class="cx"> void
</span><span class="cx"> unloadjob(launch_data_t job)
</span><span class="cx"> {
</span><del>- launch_data_t resp, tmp, tmps, msg;
- int e;
</del><ins>+ launch_data_t tmps;
</ins><span class="cx">
</span><del>- msg = launch_data_alloc(LAUNCH_DATA_DICTIONARY);
- tmp = launch_data_alloc(LAUNCH_DATA_STRING);
</del><span class="cx"> tmps = launch_data_dict_lookup(job, LAUNCH_JOBKEY_LABEL);
</span><span class="cx">
</span><span class="cx"> if (!tmps) {
</span><span class="lines">@@ -452,20 +449,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- launch_data_set_string(tmp, launch_data_get_string(tmps));
- launch_data_dict_insert(msg, tmp, LAUNCH_KEY_REMOVEJOB);
- resp = launch_msg(msg);
- launch_data_free(msg);
- if (!resp) {
- fprintf(stderr, "%s: Error: launch_msg(): %s\n", getprogname(), strerror(errno));
- return;
- }
- if (LAUNCH_DATA_ERRNO == launch_data_get_type(resp)) {
- if ((e = launch_data_get_errno(resp))) {
- fprintf(stderr, "%s\n", strerror(e));
- }
- }
- launch_data_free(resp);
</del><ins>+ assumes(_vproc_send_signal_by_label(launch_data_get_string(tmps), VPROC_MAGIC_UNLOAD_SIGNAL) == NULL);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> launch_data_t
</span></span></pre></div>
<a id="trunklaunchdsrclaunchd_core_logicc"></a>
<div class="modfile"><h4>Modified: trunk/launchd/src/launchd_core_logic.c (23303 => 23304)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/launchd/src/launchd_core_logic.c 2007-07-11 18:10:33 UTC (rev 23303)
+++ trunk/launchd/src/launchd_core_logic.c 2007-07-11 22:11:37 UTC (rev 23304)
</span><span class="lines">@@ -105,8 +105,14 @@
</span><span class="cx">
</span><span class="cx"> extern char **environ;
</span><span class="cx">
</span><del>-mach_port_t inherited_bootstrap_port;
</del><ins>+struct waiting_for_removal {
+ SLIST_ENTRY(waiting_for_removal) sle;
+ mach_port_t reply_port;
+};
</ins><span class="cx">
</span><ins>+static bool waiting4removal_new(job_t j, mach_port_t rp);
+static void waiting4removal_delete(job_t j, struct waiting_for_removal *w4r);
+
</ins><span class="cx"> struct mspolicy {
</span><span class="cx"> SLIST_ENTRY(mspolicy) sle;
</span><span class="cx"> unsigned int allow:1, per_pid:1;
</span><span class="lines">@@ -308,6 +314,7 @@
</span><span class="cx"> SLIST_HEAD(, mspolicy) mspolicies;
</span><span class="cx"> SLIST_HEAD(, machservice) machservices;
</span><span class="cx"> SLIST_HEAD(, semaphoreitem) semaphores;
</span><ins>+ SLIST_HEAD(, waiting_for_removal) removal_watchers;
</ins><span class="cx"> #if DO_RUSAGE_SUMMATION
</span><span class="cx"> struct rusage ru;
</span><span class="cx"> #endif
</span><span class="lines">@@ -447,6 +454,7 @@
</span><span class="cx"> static jobmgr_t background_jobmgr;
</span><span class="cx">
</span><span class="cx"> /* process wide globals */
</span><ins>+mach_port_t inherited_bootstrap_port;
</ins><span class="cx"> jobmgr_t root_jobmgr;
</span><span class="cx">
</span><span class="cx"> void
</span><span class="lines">@@ -711,6 +719,7 @@
</span><span class="cx"> void
</span><span class="cx"> job_remove(job_t j)
</span><span class="cx"> {
</span><ins>+ struct waiting_for_removal *w4r;
</ins><span class="cx"> struct calendarinterval *ci;
</span><span class="cx"> struct semaphoreitem *si;
</span><span class="cx"> struct socketgroup *sg;
</span><span class="lines">@@ -778,6 +787,9 @@
</span><span class="cx"> while ((si = SLIST_FIRST(&j->semaphores))) {
</span><span class="cx"> semaphoreitem_delete(j, si);
</span><span class="cx"> }
</span><ins>+ while ((w4r = SLIST_FIRST(&j->removal_watchers))) {
+ waiting4removal_delete(j, w4r);
+ }
</ins><span class="cx">
</span><span class="cx"> if (j->prog) {
</span><span class="cx"> free(j->prog);
</span><span class="lines">@@ -4769,7 +4781,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> kern_return_t
</span><del>-job_mig_send_signal(job_t j, name_t targetlabel, int sig)
</del><ins>+job_mig_send_signal(job_t j, mach_port_t srp, name_t targetlabel, int sig)
</ins><span class="cx"> {
</span><span class="cx"> struct ldcred ldc;
</span><span class="cx"> job_t otherj;
</span><span class="lines">@@ -4788,7 +4800,24 @@
</span><span class="cx"> return BOOTSTRAP_UNKNOWN_SERVICE;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (otherj->p) {
</del><ins>+ if (sig == VPROC_MAGIC_UNLOAD_SIGNAL) {
+ bool do_block = otherj->p;
+
+ if (otherj->anonymous) {
+ return BOOTSTRAP_NOT_PRIVILEGED;
+ }
+
+ job_remove(otherj);
+
+ if (do_block) {
+ job_log(j, LOG_DEBUG, "Blocking MIG return of job_remove(): %s", otherj->label);
+ /* this is messy. We shouldn't access 'otherj' after job_remove(), but we check otherj->p first... */
+ job_assumes(otherj, waiting4removal_new(otherj, srp));
+ return MIG_NO_REPLY;
+ } else {
+ return 0;
+ }
+ } else if (otherj->p) {
</ins><span class="cx"> job_assumes(j, kill(otherj->p, sig) != -1);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -6134,3 +6163,29 @@
</span><span class="cx">
</span><span class="cx"> free(msp);
</span><span class="cx"> }
</span><ins>+
+bool
+waiting4removal_new(job_t j, mach_port_t rp)
+{
+ struct waiting_for_removal *w4r;
+
+ if (!job_assumes(j, (w4r = malloc(sizeof(struct waiting_for_removal))) != NULL)) {
+ return false;
+ }
+
+ w4r->reply_port = rp;
+
+ SLIST_INSERT_HEAD(&j->removal_watchers, w4r, sle);
+
+ return true;
+}
+
+void
+waiting4removal_delete(job_t j, struct waiting_for_removal *w4r)
+{
+ job_assumes(j, job_mig_send_signal_reply(w4r->reply_port, 0) == 0);
+
+ SLIST_REMOVE(&j->removal_watchers, w4r, waiting_for_removal, sle);
+
+ free(w4r);
+}
</ins></span></pre></div>
<a id="trunklaunchdsrclibvproc_privateh"></a>
<div class="modfile"><h4>Modified: trunk/launchd/src/libvproc_private.h (23303 => 23304)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/launchd/src/libvproc_private.h 2007-07-11 18:10:33 UTC (rev 23303)
+++ trunk/launchd/src/libvproc_private.h 2007-07-11 22:11:37 UTC (rev 23304)
</span><span class="lines">@@ -31,6 +31,9 @@
</span><span class="cx">
</span><span class="cx"> #pragma GCC visibility push(default)
</span><span class="cx">
</span><ins>+/* DO NOT use this. This is a hack for launchctl */
+#define VPROC_MAGIC_UNLOAD_SIGNAL 0x4141504C
+
</ins><span class="cx"> typedef enum {
</span><span class="cx"> VPROC_GSK_LAST_EXIT_STATUS = 1,
</span><span class="cx"> VPROC_GSK_GLOBAL_ON_DEMAND,
</span></span></pre></div>
<a id="trunklaunchdsrcprotocol_jobdefs"></a>
<div class="modfile"><h4>Modified: trunk/launchd/src/protocol_job.defs (23303 => 23304)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/launchd/src/protocol_job.defs 2007-07-11 18:10:33 UTC (rev 23303)
+++ trunk/launchd/src/protocol_job.defs 2007-07-11 22:11:37 UTC (rev 23304)
</span><span class="lines">@@ -70,6 +70,7 @@
</span><span class="cx">
</span><span class="cx"> routine send_signal(
</span><span class="cx"> __bs_port : job_t;
</span><ins>+ sreplyport __rport : mach_port_make_send_once_t;
</ins><span class="cx"> __label : name_t;
</span><span class="cx"> __signal : integer_t);
</span><span class="cx">
</span></span></pre></div>
<a id="trunklaunchdsrcprotocol_job_replydefs"></a>
<div class="modfile"><h4>Modified: trunk/launchd/src/protocol_job_reply.defs (23303 => 23304)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/launchd/src/protocol_job_reply.defs 2007-07-11 18:10:33 UTC (rev 23303)
+++ trunk/launchd/src/protocol_job_reply.defs 2007-07-11 22:11:37 UTC (rev 23304)
</span><span class="lines">@@ -37,7 +37,9 @@
</span><span class="cx">
</span><span class="cx"> skip; /* look_up */
</span><span class="cx">
</span><del>-skip; /* send_signal */
</del><ins>+simpleroutine job_mig_send_signal_reply(
+ __r_port : mach_port_move_send_once_t;
+ __result : kern_return_t, RetCode);
</ins><span class="cx">
</span><span class="cx"> skip; /* parent */
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>