<!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>[23138] trunk/launchd</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.macosforge.org/projects/launchd/changeset/23138">23138</a></dd>
<dt>Author</dt> <dd>zarzycki@apple.com</dd>
<dt>Date</dt> <dd>2007-03-06 16:32:48 -0800 (Tue, 06 Mar 2007)</dd>
</dl>
<h3>Log Message</h3>
<pre><rdar://problem/5040403> Supply an API for CoreFoundation to get the PID of the per user launchd</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunklaunchdsrclaunchd_core_logicc">trunk/launchd/src/launchd_core_logic.c</a></li>
<li><a href="#trunklaunchdsrclaunchd_mig_typesdefs">trunk/launchd/src/launchd_mig_types.defs</a></li>
<li><a href="#trunklaunchdsrclibvprocc">trunk/launchd/src/libvproc.c</a></li>
<li><a href="#trunklaunchdsrclibvproc_internalh">trunk/launchd/src/libvproc_internal.h</a></li>
<li><a href="#trunklaunchdsrclibvproc_publich">trunk/launchd/src/libvproc_public.h</a></li>
<li><a href="#trunklaunchdsrcprotocol_jobdefs">trunk/launchd/src/protocol_job.defs</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunklaunchdtestingvproc_gsk_testc">trunk/launchd/testing/vproc_gsk_test.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 (23137 => 23138)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/launchd/src/launchd_core_logic.c 2007-03-06 21:38:02 UTC (rev 23137)
+++ trunk/launchd/src/launchd_core_logic.c 2007-03-07 00:32:48 UTC (rev 23138)
</span><span class="lines">@@ -4170,7 +4170,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> kern_return_t
</span><del>-job_mig_get_integer(job_t j, get_set_int_key_t key, int64_t *val)
</del><ins>+job_mig_swap_integer(job_t j, vproc_gsk_t inkey, vproc_gsk_t outkey, int64_t inval, int64_t *outval)
</ins><span class="cx"> {
</span><span class="cx"> kern_return_t kr = 0;
</span><span class="cx">
</span><span class="lines">@@ -4178,15 +4178,38 @@
</span><span class="cx"> return BOOTSTRAP_NO_MEMORY;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- switch (key) {
- case LAST_EXIT_STATUS:
- *val = j->last_exit_status;
</del><ins>+ switch (outkey) {
+ case VPROC_GSK_LAST_EXIT_STATUS:
+ *outval = j->last_exit_status;
</ins><span class="cx"> break;
</span><ins>+ case VPROC_GSK_MGR_UID:
+ *outval = getuid();
+ break;
+ case VPROC_GSK_MGR_PID:
+ *outval = getpid();
+ break;
+ case 0:
+ *outval = 0;
+ break;
</ins><span class="cx"> default:
</span><span class="cx"> kr = 1;
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ switch (inkey) {
+ case VPROC_GSK_GLOBAL_ON_DEMAND:
+ kr = job_set_global_on_demand(j, (bool)inval) ? 0 : 1;
+ break;
+ case 0:
+ break;
+ case VPROC_GSK_LAST_EXIT_STATUS:
+ case VPROC_GSK_MGR_UID:
+ case VPROC_GSK_MGR_PID:
+ default:
+ kr = 1;
+ break;
+ }
+
</ins><span class="cx"> return kr;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -4213,27 +4236,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> kern_return_t
</span><del>-job_mig_set_integer(job_t j, get_set_int_key_t key, int64_t val)
-{
- kern_return_t kr = 0;
-
- if (!launchd_assumes(j != NULL)) {
- return BOOTSTRAP_NO_MEMORY;
- }
-
- switch (key) {
- case GLOBAL_ON_DEMAND:
- kr = job_set_global_on_demand(j, (bool)val) ? 0 : 1;
- break;
- default:
- kr = 1;
- break;
- }
-
- return kr;
-}
-
-kern_return_t
</del><span class="cx"> job_mig_getsocket(job_t j, name_t spr)
</span><span class="cx"> {
</span><span class="cx"> if (!launchd_assumes(j != NULL)) {
</span></span></pre></div>
<a id="trunklaunchdsrclaunchd_mig_typesdefs"></a>
<div class="modfile"><h4>Modified: trunk/launchd/src/launchd_mig_types.defs (23137 => 23138)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/launchd/src/launchd_mig_types.defs 2007-03-06 21:38:02 UTC (rev 23137)
+++ trunk/launchd/src/launchd_mig_types.defs 2007-03-07 00:32:48 UTC (rev 23138)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> type pid_t = integer_t;
</span><span class="cx"> type uid_t = integer_t;
</span><span class="cx"> type gid_t = integer_t;
</span><del>-type get_set_int_key_t = integer_t;
</del><ins>+type vproc_gsk_t = integer_t;
</ins><span class="cx"> type logmsg_t = c_string[*:2048];
</span><span class="cx"> type cmd_t = c_string[512];
</span><span class="cx"> type cmd_array_t = ^array [] of cmd_t;
</span></span></pre></div>
<a id="trunklaunchdsrclibvprocc"></a>
<div class="modfile"><h4>Modified: trunk/launchd/src/libvproc.c (23137 => 23138)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/launchd/src/libvproc.c 2007-03-06 21:38:02 UTC (rev 23137)
+++ trunk/launchd/src/libvproc.c 2007-03-07 00:32:48 UTC (rev 23138)
</span><span class="lines">@@ -201,7 +201,7 @@
</span><span class="cx"> {
</span><span class="cx"> int64_t val;
</span><span class="cx">
</span><del>- if (vproc_mig_get_integer(bootstrap_port, LAST_EXIT_STATUS, &val) == 0) {
</del><ins>+ if (vproc_swap_integer(NULL, VPROC_GSK_LAST_EXIT_STATUS, 0, &val) == 0) {
</ins><span class="cx"> *wstatus = (int)val;
</span><span class="cx"> return NULL;
</span><span class="cx"> }
</span><span class="lines">@@ -209,6 +209,18 @@
</span><span class="cx"> return (vproc_err_t)_vproc_get_last_exit_status;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+vproc_err_t
+vproc_swap_integer(vproc_t vp __attribute__((unused)), vproc_gsk_t key, int64_t *inval, int64_t *outval)
+{
+ int64_t dummyval = 0;
+
+ if (vproc_mig_swap_integer(bootstrap_port, inval ? key : 0, outval ? key : 0, inval ? *inval : 0, outval ? outval : &dummyval) == 0) {
+ return NULL;
+ }
+
+ return (vproc_err_t)vproc_swap_integer;
+}
+
</ins><span class="cx"> void *
</span><span class="cx"> reboot2(uint64_t flags)
</span><span class="cx"> {
</span><span class="lines">@@ -242,7 +254,7 @@
</span><span class="cx"> {
</span><span class="cx"> int64_t val = state ? ~0 : 0;
</span><span class="cx">
</span><del>- if (vproc_mig_set_integer(bootstrap_port, GLOBAL_ON_DEMAND, val) == 0) {
</del><ins>+ if (vproc_swap_integer(NULL, VPROC_GSK_GLOBAL_ON_DEMAND, &val, NULL) == 0) {
</ins><span class="cx"> return NULL;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunklaunchdsrclibvproc_internalh"></a>
<div class="modfile"><h4>Modified: trunk/launchd/src/libvproc_internal.h (23137 => 23138)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/launchd/src/libvproc_internal.h 2007-03-06 21:38:02 UTC (rev 23137)
+++ trunk/launchd/src/libvproc_internal.h 2007-03-07 00:32:48 UTC (rev 23138)
</span><span class="lines">@@ -28,10 +28,6 @@
</span><span class="cx"> typedef char * logmsg_t;
</span><span class="cx"> typedef mach_port_t vproc_mig_t;
</span><span class="cx"> typedef integer_t binpref_t[8];
</span><del>-typedef enum {
- LAST_EXIT_STATUS = 1,
- GLOBAL_ON_DEMAND,
-} get_set_int_key_t;
</del><span class="cx">
</span><span class="cx"> #ifdef protocol_vproc_MSG_COUNT
</span><span class="cx"> /* HACK */
</span></span></pre></div>
<a id="trunklaunchdsrclibvproc_publich"></a>
<div class="modfile"><h4>Modified: trunk/launchd/src/libvproc_public.h (23137 => 23138)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/launchd/src/libvproc_public.h 2007-03-06 21:38:02 UTC (rev 23137)
+++ trunk/launchd/src/libvproc_public.h 2007-03-07 00:32:48 UTC (rev 23138)
</span><span class="lines">@@ -21,16 +21,30 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> #include <sys/cdefs.h>
</span><ins>+#include <sys/types.h>
</ins><span class="cx">
</span><span class="cx"> __BEGIN_DECLS
</span><span class="cx">
</span><ins>+#pragma GCC visibility push(default)
+
+typedef enum {
+ VPROC_GSK_LAST_EXIT_STATUS = 1,
+ VPROC_GSK_GLOBAL_ON_DEMAND,
+ VPROC_GSK_MGR_UID,
+ VPROC_GSK_MGR_PID,
+} vproc_gsk_t;
+
</ins><span class="cx"> typedef void * vproc_err_t;
</span><span class="cx">
</span><span class="cx"> typedef void * vproc_t;
</span><span class="cx"> typedef void * vprocmgr_t;
</span><span class="cx">
</span><ins>+vproc_err_t vproc_swap_integer(vproc_t vp, vproc_gsk_t key, int64_t *inval, int64_t *outval);
+
</ins><span class="cx"> const char *vproc_strerror(vproc_err_t r);
</span><span class="cx">
</span><ins>+#pragma GCC visibility pop
+
</ins><span class="cx"> __END_DECLS
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunklaunchdsrcprotocol_jobdefs"></a>
<div class="modfile"><h4>Modified: trunk/launchd/src/protocol_job.defs (23137 => 23138)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/launchd/src/protocol_job.defs 2007-03-06 21:38:02 UTC (rev 23137)
+++ trunk/launchd/src/protocol_job.defs 2007-03-07 00:32:48 UTC (rev 23138)
</span><span class="lines">@@ -121,15 +121,14 @@
</span><span class="cx"> routine uncork_fork(
</span><span class="cx"> __bs_port : job_t);
</span><span class="cx">
</span><del>-routine get_integer(
</del><ins>+routine swap_integer(
</ins><span class="cx"> __bs_port : job_t;
</span><del>- __key : get_set_int_key_t;
- out __val : int64_t);
</del><ins>+ __inkey : vproc_gsk_t;
+ __outkey : vproc_gsk_t;
+ __inval : int64_t;
+ out __outval : int64_t);
</ins><span class="cx">
</span><del>-routine set_integer(
- __bs_port : job_t;
- __key : get_set_int_key_t;
- __val : int64_t);
</del><ins>+skip;
</ins><span class="cx">
</span><span class="cx"> simpleroutine log(
</span><span class="cx"> __bs_port : job_t;
</span></span></pre></div>
<a id="trunklaunchdtestingvproc_gsk_testc"></a>
<div class="addfile"><h4>Added: trunk/launchd/testing/vproc_gsk_test.c (0 => 23138)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/launchd/testing/vproc_gsk_test.c (rev 0)
+++ trunk/launchd/testing/vproc_gsk_test.c 2007-03-07 00:32:48 UTC (rev 23138)
</span><span class="lines">@@ -0,0 +1,23 @@
</span><ins>+#include <stdio.h>
+#include <stdbool.h>
+#include <assert.h>
+#include <vproc.h>
+
+int main(void)
+{
+ int64_t val;
+ pid_t p;
+ uid_t u;
+
+ /* we assign val to p or u due to 64 bit to 32 bit trucation */
+
+ assert(vproc_swap_integer(NULL, VPROC_GSK_MGR_PID, NULL, &val) == NULL);
+ p = val;
+
+ assert(vproc_swap_integer(NULL, VPROC_GSK_MGR_UID, NULL, &val) == NULL);
+ u = val;
+
+ fprintf(stdout, "UID = %u PID = %u\n", u, p);
+
+ return 0;
+}
</ins></span></pre>
</div>
</div>
</body>
</html>