<!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>[23125] 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/23125">23125</a></dd>
<dt>Author</dt> <dd>zarzycki@apple.com</dd>
<dt>Date</dt> <dd>2007-03-03 15:42:02 -0800 (Sat, 03 Mar 2007)</dd>
</dl>
<h3>Log Message</h3>
<pre><rdar://problem/4369850> launchd should have a per-user bootstrap context ("background session")</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 (23124 => 23125)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/launchd/src/launchd_core_logic.c 2007-03-03 23:09:49 UTC (rev 23124)
+++ trunk/launchd/src/launchd_core_logic.c 2007-03-03 23:42:02 UTC (rev 23125)
</span><span class="lines">@@ -272,7 +272,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;
</del><ins>+ wait4pipe_eof:1, sent_sigkill:1, debug_before_kill:1, weird_per_user_bootstrap:1;
</ins><span class="cx"> char label[0];
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -1649,6 +1649,17 @@
</span><span class="cx">
</span><span class="cx"> job_log(j, LOG_DEBUG, "Reaping");
</span><span class="cx">
</span><ins>+ if (j->weird_per_user_bootstrap) {
+ mach_msg_size_t mxmsgsz = sizeof(union __RequestUnion__job_mig_protocol_vproc_subsystem);
+
+ if (job_mig_protocol_vproc_subsystem.maxsize > mxmsgsz) {
+ mxmsgsz = job_mig_protocol_vproc_subsystem.maxsize;
+ }
+
+ job_assumes(j, runtime_add_mport(j->mgr->jm_port, protocol_vproc_server, mxmsgsz) == KERN_SUCCESS);
+ j->weird_per_user_bootstrap = false;
+ }
+
</ins><span class="cx"> if (j->log_redirect_fd && (!j->wait4pipe_eof || j->mgr->shutting_down)) {
</span><span class="cx"> job_assumes(j, close(j->log_redirect_fd) != -1);
</span><span class="cx"> j->log_redirect_fd = 0;
</span><span class="lines">@@ -1985,7 +1996,7 @@
</span><span class="cx">
</span><span class="cx"> time(&j->start_time);
</span><span class="cx">
</span><del>- switch (c = runtime_fork(j->mgr->jm_port)) {
</del><ins>+ switch (c = runtime_fork(j->weird_per_user_bootstrap ? j->j_port : j->mgr->jm_port)) {
</ins><span class="cx"> case -1:
</span><span class="cx"> job_log_error(j, LOG_ERR, "fork() failed, will try again in one second");
</span><span class="cx"> job_assumes(j, close(execspair[0]) == 0);
</span><span class="lines">@@ -3465,10 +3476,6 @@
</span><span class="cx"> mxmsgsz = job_mig_protocol_vproc_subsystem.maxsize;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (!jobmgr_assumes(jmr, runtime_add_mport(jmr->jm_port, protocol_vproc_server, mxmsgsz) == KERN_SUCCESS)) {
- goto out_bad;
- }
-
</del><span class="cx"> jobmgr_assumes(jmr, (jmr->anonj = jobmgr_get_anonymous(jmr)) != NULL);
</span><span class="cx">
</span><span class="cx"> bootstrapper = job_new(jmr, "com.apple.launchctld", NULL, bootstrap_tool);
</span><span class="lines">@@ -3477,6 +3484,16 @@
</span><span class="cx"> jobmgr_assumes(jmr, kevent_mod(SIGTERM, EVFILT_SIGNAL, EV_ADD, 0, 0, jmr) != -1);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (!jm && getuid() != 0) {
+ /* per-user bootstrap context is messy */
+ bootstrapper->weird_per_user_bootstrap = true;
+ jobmgr_assumes(jmr, job_setup_machport(bootstrapper));
+ } else {
+ if (!jobmgr_assumes(jmr, runtime_add_mport(jmr->jm_port, protocol_vproc_server, mxmsgsz) == KERN_SUCCESS)) {
+ goto out_bad;
+ }
+ }
+
</ins><span class="cx"> jobmgr_log(jmr, LOG_DEBUG, "Created job manager%s%s", jm ? " with parent: " : ".", jm ? jm->name : "");
</span><span class="cx">
</span><span class="cx"> if (!jm && jobmgr_assumes(jmr, bootstrapper != NULL)) {
</span></span></pre>
</div>
</div>
</body>
</html>