Changeset 23485

Timestamp:

01/18/08 09:49:34 (11 months ago)

Author:

zarzycki@…

Message:

<rdar://problem/5692704> SpringBoard needs custom launchd job management API

Location:

branches/SULeopard/launchd/src

Files:

• launchd_core_logic.c (modified) (5 diffs)
• launchd_runtime.h (modified) (1 diff)
• liblaunch_public.h (modified) (1 diff)
• libvproc.c (modified) (1 diff)
• libvproc_private.h (modified) (1 diff)
• protocol_job.defs (modified) (1 diff)

branches/SULeopard/launchd/src/launchd_core_logic.c

@@ -323 +323 @@
         size_t j_binpref_cnt;
         mach_port_t j_port;
-        mach_port_t wait_reply_port;
+        mach_port_t wait_reply_port;    /* we probably should switch to a list of waiters */
         uid_t mach_uid;
         jobmgr_t mgr;
@@ -362 +362 @@
                      wait4pipe_eof:1, sent_sigkill:1, debug_before_kill:1, weird_bootstrap:1, start_on_mount:1,
                      per_user:1, hopefully_exits_first:1, deny_unknown_mslookups:1, unload_at_mig_return:1, abandon_pg:1,
-                     poll_for_vfs_changes:1, internal_exc_handler:1;
+                     poll_for_vfs_changes:1, internal_exc_handler:1, can_kickstart:1;
         const char label[0];
 };
@@ -1569 +1569 @@
 }
 
+static void
+policy_setup(launch_data_t obj, const char *key, void *context)
+{
+        job_t j = context;
+        bool found_key = false;
+
+        switch (key[0]) {
+        case 'c':
+        case 'C':
+                if (strcasecmp(key, LAUNCH_JOBPOLICY_CANKICKSTARTOTHERJOBS) == 0) {
+                        j->can_kickstart = launch_data_get_bool(obj);
+                        found_key = true;
+                }
+                break;
+        default:
+                break;
+        }
+
+        if (unlikely(!found_key)) {
+                job_log(j, LOG_WARNING, "Unknown policy: %s", key);
+        }
+}
+
 void
 job_import_dictionary(job_t j, const char *key, launch_data_t value)
@@ -1575 +1598 @@
 
         switch (key[0]) {
+        case 'p':
+        case 'P':
+                if (strcasecmp(key, LAUNCH_JOBKEY_POLICIES) == 0) {
+                        launch_data_dict_iterate(value, policy_setup, j);
+                }
+                break;
         case 'k':
         case 'K':
@@ -6368 +6397 @@
 
 kern_return_t
+job_mig_embedded_wait(job_t j, name_t targetlabel, integer_t *waitstatus)
+{
+        job_t otherj;
+
+        if (!launchd_assumes(j != NULL)) {
+                return BOOTSTRAP_NO_MEMORY;
+        }
+
+        if (unlikely(!(otherj = job_find(targetlabel)))) {
+                return BOOTSTRAP_UNKNOWN_SERVICE;
+        }
+
+        *waitstatus = j->last_exit_status;
+
+        return 0;
+}
+
+kern_return_t
+job_mig_embedded_kickstart(job_t j, name_t targetlabel, pid_t *out_pid, mach_port_t *out_name_port)
+{
+        struct ldcred ldc;
+        kern_return_t kr;
+        job_t otherj;
+
+        if (!launchd_assumes(j != NULL)) {
+                return BOOTSTRAP_NO_MEMORY;
+        }
+
+        runtime_get_caller_creds(&ldc);
+
+        if (!j->can_kickstart || (ldc.euid != 0 && ldc.euid != geteuid())) {
+                return BOOTSTRAP_NOT_PRIVILEGED;
+        }
+
+        if (unlikely(!(otherj = job_find(targetlabel)))) {
+                return BOOTSTRAP_UNKNOWN_SERVICE;
+        }
+
+        otherj = job_dispatch(otherj, true);
+
+        if (!job_assumes(j, otherj && otherj->p)) {
+                return BOOTSTRAP_NO_MEMORY;
+        }
+
+        kr = task_name_for_pid(mach_task_self(), otherj->p, out_name_port);
+        if (!job_assumes(j, kr == 0)) {
+                return kr;
+        }
+
+        *out_pid = otherj->p;
+
+        return 0;
+}
+
+kern_return_t
 job_mig_wait(job_t j, mach_port_t srp, integer_t *waitstatus)
 {

branches/SULeopard/launchd/src/launchd_runtime.h

@@ -50 +50 @@
 
 #define launchd_assert(e)       if (__builtin_constant_p(e)) { char __compile_time_assert__[e ? 1 : -1] __attribute__((unused)); } else if (!launchd_assumes(e)) { abort(); }
+
+#define likely(x)       __builtin_expect((bool)(x), true)
+#define unlikely(x)     __builtin_expect((bool)(x), false)
 
 void _log_launchd_bug(const char *rcs_rev, const char *path, unsigned int line, const char *test);

branches/SULeopard/launchd/src/liblaunch_public.h

@@ -100 +100 @@
 #define LAUNCH_JOBKEY_LAUNCHONLYONCE            "LaunchOnlyOnce"
 #define LAUNCH_JOBKEY_ABANDONPROCESSGROUP       "AbandonProcessGroup"
+#define LAUNCH_JOBKEY_POLICIES                  "Policies"
+
+#define LAUNCH_JOBPOLICY_CANKICKSTARTOTHERJOBS  "CanKickStartOtherJobs"
 
 #define LAUNCH_JOBINETDCOMPATIBILITY_WAIT       "Wait"

branches/SULeopard/launchd/src/libvproc.c

@@ -554 +554 @@
 
 vproc_err_t
+_vproc_kickstart_by_label(const char *label, pid_t *out_pid, mach_port_t *out_port_name)
+{
+        if (vproc_mig_embedded_kickstart(bootstrap_port, (char *)label, out_pid, out_port_name) == 0) {
+                return NULL;
+        }
+
+        return (vproc_err_t)_vproc_kickstart_by_label;
+}
+
+vproc_err_t
+_vproc_wait_by_label(const char *label, int *out_wstatus)
+{
+        if (vproc_mig_embedded_wait(bootstrap_port, (char *)label, out_wstatus) == 0) {
+                return NULL;
+        }
+
+        return (vproc_err_t)_vproc_wait_by_label;
+}
+
+vproc_err_t
 _vproc_set_global_on_demand(bool state)
 {

branches/SULeopard/launchd/src/libvproc_private.h

@@ -62 +62 @@
 
 vproc_err_t _vproc_send_signal_by_label(const char *label, int sig);
+vproc_err_t _vproc_kickstart_by_label(const char *label, pid_t *out_pid, mach_port_t *out_port_name);
+vproc_err_t _vproc_wait_by_label(const char *label, int *out_wstatus);
 
 void _vproc_log(int pri, const char *msg, ...) __attribute__((format(printf, 2, 3)));

branches/SULeopard/launchd/src/protocol_job.defs

@@ -167 +167 @@
                 __bs_port       : job_t;
                 __inval         : pointer_t);
+
+routine embedded_kickstart(
+                __bs_port       : job_t;
+                __label         : name_t;
+        out     __pid           : pid_t;
+        out     __name_port     : mach_port_t);
+
+routine embedded_wait(
+                __bs_port       : job_t;
+                __label         : name_t;
+        out     __waitval       : integer_t);