Changeset 23138

Timestamp:

03/06/07 16:32:48 (21 months ago)

Author:

zarzycki@…

Message:

<rdar://problem/5040403> Supply an API for CoreFoundation to get the PID of the per user launchd

Location:

trunk/launchd

Files:

• src/launchd_core_logic.c (modified) (4 diffs)
• src/launchd_mig_types.defs (modified) (1 diff)
• src/libvproc.c (modified) (3 diffs)
• src/libvproc_internal.h (modified) (1 diff)
• src/libvproc_public.h (modified) (2 diffs)
• src/protocol_job.defs (modified) (1 diff)
• testing/vproc_gsk_test.c (added)

trunk/launchd/src/launchd_core_logic.c

@@ -4171 +4171 @@
 
 kern_return_t
-job_mig_get_integer(job_t j, get_set_int_key_t key, int64_t *val)
+job_mig_swap_integer(job_t j, vproc_gsk_t inkey, vproc_gsk_t outkey, int64_t inval, int64_t *outval)
 {
         kern_return_t kr = 0;
@@ -4179 +4179 @@
         }
 
-        switch (key) {
-        case LAST_EXIT_STATUS:
-                *val = j->last_exit_status;
+        switch (outkey) {
+        case VPROC_GSK_LAST_EXIT_STATUS:
+                *outval = j->last_exit_status;
+                break;
+        case VPROC_GSK_MGR_UID:
+                *outval = getuid();
+                break;
+        case VPROC_GSK_MGR_PID:
+                *outval = getpid();
+                break;
+        case 0:
+                *outval = 0;
                 break;
         default:
@@ -4188 +4197 @@
         }
 
+        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;
+        }
+
         return kr;
 }
@@ -4211 +4234 @@
 
         return 0;
-}
-
-kern_return_t
-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;
 }
 

trunk/launchd/src/launchd_mig_types.defs

@@ -27 +27 @@
 type uid_t                      = integer_t;
 type gid_t                      = integer_t;
-type get_set_int_key_t          = integer_t;
+type vproc_gsk_t                = integer_t;
 type logmsg_t                   = c_string[*:2048];
 type cmd_t                      = c_string[512];

trunk/launchd/src/libvproc.c

@@ -202 +202 @@
         int64_t val;
 
-        if (vproc_mig_get_integer(bootstrap_port, LAST_EXIT_STATUS, &val) == 0) {
+        if (vproc_swap_integer(NULL, VPROC_GSK_LAST_EXIT_STATUS, 0, &val) == 0) {
                 *wstatus = (int)val;
                 return NULL;
@@ -208 +208 @@
 
         return (vproc_err_t)_vproc_get_last_exit_status;
+}
+
+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;
 }
 
@@ -243 +255 @@
         int64_t val = state ? ~0 : 0;
 
-        if (vproc_mig_set_integer(bootstrap_port, GLOBAL_ON_DEMAND, val) == 0) {
+        if (vproc_swap_integer(NULL, VPROC_GSK_GLOBAL_ON_DEMAND, &val, NULL) == 0) {
                 return NULL;
         }

trunk/launchd/src/libvproc_internal.h

@@ -29 +29 @@
 typedef mach_port_t vproc_mig_t;
 typedef integer_t binpref_t[8];
-typedef enum {
-        LAST_EXIT_STATUS = 1,
-        GLOBAL_ON_DEMAND,
-} get_set_int_key_t;
 
 #ifdef protocol_vproc_MSG_COUNT

trunk/launchd/src/libvproc_public.h

@@ -22 +22 @@
 
 #include <sys/cdefs.h>
+#include <sys/types.h>
 
 __BEGIN_DECLS
+
+#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;
 
 typedef void * vproc_err_t;
@@ -30 +40 @@
 typedef void * vprocmgr_t;
 
+vproc_err_t vproc_swap_integer(vproc_t vp, vproc_gsk_t key, int64_t *inval, int64_t *outval);
+
 const char *vproc_strerror(vproc_err_t r);
+
+#pragma GCC visibility pop
 
 __END_DECLS

trunk/launchd/src/protocol_job.defs

@@ -122 +122 @@
                 __bs_port       : job_t);
 
-routine get_integer(
+routine swap_integer(
                 __bs_port       : job_t;
-                __key           : get_set_int_key_t;
-        out     __val           : int64_t);
+                __inkey         : vproc_gsk_t;
+                __outkey        : vproc_gsk_t;
+                __inval         : int64_t;
+        out     __outval        : int64_t);
 
-routine set_integer(
-                __bs_port       : job_t;
-                __key           : get_set_int_key_t;
-                __val           : int64_t);
+skip;
 
 simpleroutine log(