<!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, #msg p { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul { 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>[23539] trunk/launchd/src</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.macosforge.org/projects/launchd/changeset/23539">23539</a></dd>
<dt>Author</dt> <dd>zarzycki@apple.com</dd>
<dt>Date</dt> <dd>2008-03-06 11:00:19 -0800 (Thu, 06 Mar 2008)</dd>
</dl>
<h3>Log Message</h3>
<pre>Refinements on:
<rdar://problem/5783944> Deprecate bootstrap_create_service() in favor of bootstrap_check_in()</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunklaunchdsrclaunchd_core_logicc">trunk/launchd/src/launchd_core_logic.c</a></li>
<li><a href="#trunklaunchdsrclibbootstrapc">trunk/launchd/src/libbootstrap.c</a></li>
<li><a href="#trunklaunchdsrclibbootstrap_privateh">trunk/launchd/src/libbootstrap_private.h</a></li>
<li><a href="#trunklaunchdsrcprotocol_jobdefs">trunk/launchd/src/protocol_job.defs</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 (23538 => 23539)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/launchd/src/launchd_core_logic.c 2008-03-06 18:46:35 UTC (rev 23538)
+++ trunk/launchd/src/launchd_core_logic.c 2008-03-06 19:00:19 UTC (rev 23539)
</span><span class="lines">@@ -140,8 +140,9 @@
</span><span class="cx"> job_t job;
</span><span class="cx"> unsigned int gen_num;
</span><span class="cx"> mach_port_name_t port;
</span><del>- unsigned int isActive:1, reset:1, recv:1, hide:1, kUNCServer:1,
- per_user_hack:1, debug_on_close:1, per_pid:1, special_port_num:24;
</del><ins>+ unsigned int isActive:1, reset:1, recv:1, hide:1,
+ kUNCServer:1, per_user_hack:1, debug_on_close:1, per_pid:1,
+ delete_on_destruction:1, special_port_num:23;
</ins><span class="cx"> const char name[0];
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -4888,6 +4889,7 @@
</span><span class="cx"> job_ack_port_destruction(mach_port_t p)
</span><span class="cx"> {
</span><span class="cx"> struct machservice *ms;
</span><ins>+ job_t j;
</ins><span class="cx">
</span><span class="cx"> LIST_FOREACH(ms, &port_hash[HASH_PORT(p)], port_hash_sle) {
</span><span class="cx"> if (ms->recv && (ms->port == p)) {
</span><span class="lines">@@ -4895,18 +4897,23 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (!ms) {
</del><ins>+ if (!jobmgr_assumes(root_jobmgr, ms != NULL)) {
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ j = ms->job;
+
+ job_log(j, LOG_DEBUG, "Receive right returned to us: %s", ms->name);
+
</ins><span class="cx"> ms->isActive = false;
</span><span class="cx">
</span><del>- if (ms->reset) {
- machservice_resetport(ms->job, ms);
</del><ins>+ if (ms->delete_on_destruction) {
+ machservice_delete(j, ms, false);
+ } else if (ms->reset) {
+ machservice_resetport(j, ms);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- job_log(ms->job, LOG_DEBUG, "Receive right returned to us: %s", ms->name);
- job_dispatch(ms->job, false);
</del><ins>+ job_dispatch(j, false);
</ins><span class="cx">
</span><span class="cx"> root_jobmgr = jobmgr_do_garbage_collection(root_jobmgr);
</span><span class="cx">
</span><span class="lines">@@ -5901,26 +5908,27 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> kern_return_t
</span><del>-job_mig_check_in(job_t j, name_t servicename, mach_port_t *serviceportp)
</del><ins>+job_mig_check_in2(job_t j, name_t servicename, mach_port_t *serviceportp, uint64_t flags)
</ins><span class="cx"> {
</span><ins>+ bool per_pid_service = flags & BOOTSTRAP_PER_PID_SERVICE;
+ struct ldcred *ldc = runtime_get_caller_creds();
</ins><span class="cx"> struct machservice *ms;
</span><del>- struct ldcred *ldc = runtime_get_caller_creds();
</del><span class="cx"> job_t jo;
</span><span class="cx">
</span><span class="cx"> if (!launchd_assumes(j != NULL)) {
</span><span class="cx"> return BOOTSTRAP_NO_MEMORY;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- ms = jobmgr_lookup_service(j->mgr, servicename, true, 0);
</del><ins>+ ms = jobmgr_lookup_service(j->mgr, servicename, false, per_pid_service ? ldc->pid : 0);
</ins><span class="cx">
</span><span class="cx"> if (ms == NULL) {
</span><span class="cx"> *serviceportp = MACH_PORT_NULL;
</span><del>- ms = machservice_new(j, servicename, serviceportp, false);
</del><span class="cx">
</span><del>- if (unlikely(ms == NULL)) {
</del><ins>+ if (unlikely((ms = machservice_new(j, servicename, serviceportp, per_pid_service)) == NULL)) {
</ins><span class="cx"> return BOOTSTRAP_NO_MEMORY;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ ms->delete_on_destruction = true; /* parity with bootstrap_register() */
</ins><span class="cx"> job_checkin(j);
</span><span class="cx">
</span><span class="cx"> if (!(j->anonymous || j->legacy_LS_job || j->legacy_mach_job)) {
</span></span></pre></div>
<a id="trunklaunchdsrclibbootstrapc"></a>
<div class="modfile"><h4>Modified: trunk/launchd/src/libbootstrap.c (23538 => 23539)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/launchd/src/libbootstrap.c 2008-03-06 18:46:35 UTC (rev 23538)
+++ trunk/launchd/src/libbootstrap.c 2008-03-06 19:00:19 UTC (rev 23539)
</span><span class="lines">@@ -116,10 +116,16 @@
</span><span class="cx"> kern_return_t
</span><span class="cx"> bootstrap_check_in(mach_port_t bp, name_t service_name, mach_port_t *sp)
</span><span class="cx"> {
</span><del>- return vproc_mig_check_in(bp, service_name, sp);
</del><ins>+ return vproc_mig_check_in2(bp, service_name, sp, 0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> kern_return_t
</span><ins>+bootstrap_check_in2(mach_port_t bp, name_t service_name, mach_port_t *sp, uint64_t flags)
+{
+ return vproc_mig_check_in2(bp, service_name, sp, flags);
+}
+
+kern_return_t
</ins><span class="cx"> bootstrap_look_up_per_user(mach_port_t bp, name_t service_name, uid_t target_user, mach_port_t *sp)
</span><span class="cx"> {
</span><span class="cx"> struct stat sb;
</span></span></pre></div>
<a id="trunklaunchdsrclibbootstrap_privateh"></a>
<div class="modfile"><h4>Modified: trunk/launchd/src/libbootstrap_private.h (23538 => 23539)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/launchd/src/libbootstrap_private.h 2008-03-06 18:46:35 UTC (rev 23538)
+++ trunk/launchd/src/libbootstrap_private.h 2008-03-06 19:00:19 UTC (rev 23539)
</span><span class="lines">@@ -35,6 +35,8 @@
</span><span class="cx">
</span><span class="cx"> kern_return_t bootstrap_look_up2(mach_port_t bp, name_t service_name, mach_port_t *sp, pid_t target_pid, uint64_t flags);
</span><span class="cx">
</span><ins>+kern_return_t bootstrap_check_in2(mach_port_t bp, name_t service_name, mach_port_t *sp, uint64_t flags);
+
</ins><span class="cx"> kern_return_t bootstrap_look_up_per_user(mach_port_t bp, name_t service_name, uid_t target_user, mach_port_t *sp);
</span><span class="cx">
</span><span class="cx"> kern_return_t bootstrap_set_policy(mach_port_t bp, pid_t target_pid, uint64_t flags, const char *target_service);
</span></span></pre></div>
<a id="trunklaunchdsrcprotocol_jobdefs"></a>
<div class="modfile"><h4>Modified: trunk/launchd/src/protocol_job.defs (23538 => 23539)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/launchd/src/protocol_job.defs 2008-03-06 18:46:35 UTC (rev 23538)
+++ trunk/launchd/src/protocol_job.defs 2008-03-06 19:00:19 UTC (rev 23539)
</span><span class="lines">@@ -50,10 +50,11 @@
</span><span class="cx"> __bs_port : job_t;
</span><span class="cx"> __flags : uint64_t);
</span><span class="cx">
</span><del>-routine check_in(
- __bs_port : job_t;
- __service_name : name_t;
- out __service_port : mach_port_move_receive_t);
</del><ins>+routine check_in2(
+ __bs_port : job_t;
+ __service_name : name_t;
+ out __service_port : mach_port_move_receive_t;
+ __flags : uint64_t);
</ins><span class="cx">
</span><span class="cx"> routine register2(
</span><span class="cx"> __bs_port : job_t;
</span></span></pre>
</div>
</div>
</body>
</html>