Changeset 23539

Timestamp:

2008-03-06 11:00:19 (7 months ago)

Author:

zarzycki@…

Message:

Refinements on:
<rdar://problem/5783944> Deprecate bootstrap_create_service() in favor of bootstrap_check_in()

Location:

trunk/launchd/src

Files:

• launchd_core_logic.c (modified) (5 diffs)
• libbootstrap.c (modified) (1 diff)
• libbootstrap_private.h (modified) (1 diff)
• protocol_job.defs (modified) (1 diff)

trunk/launchd/src/launchd_core_logic.c

@@ -141 +141 @@
         unsigned int            gen_num;
         mach_port_name_t        port;
-        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;
+        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;
         const char              name[0];
 };
@@ -4889 +4890 @@
 {
         struct machservice *ms;
+        job_t j;
 
         LIST_FOREACH(ms, &port_hash[HASH_PORT(p)], port_hash_sle) {
@@ -4896 +4898 @@
         }
 
-        if (!ms) {
+        if (!jobmgr_assumes(root_jobmgr, ms != NULL)) {
                 return false;
         }
 
+        j = ms->job;
+
+        job_log(j, LOG_DEBUG, "Receive right returned to us: %s", ms->name);
+
         ms->isActive = false;
 
-        if (ms->reset) {
-                machservice_resetport(ms->job, ms);
-        }
-
-        job_log(ms->job, LOG_DEBUG, "Receive right returned to us: %s", ms->name);
-        job_dispatch(ms->job, false);
+        if (ms->delete_on_destruction) {
+                machservice_delete(j, ms, false);
+        } else if (ms->reset) {
+                machservice_resetport(j, ms);
+        }
+
+        job_dispatch(j, false);
 
         root_jobmgr = jobmgr_do_garbage_collection(root_jobmgr);
@@ -5902 +5909 @@
 
 kern_return_t
-job_mig_check_in(job_t j, name_t servicename, mach_port_t *serviceportp)
-{
+job_mig_check_in2(job_t j, name_t servicename, mach_port_t *serviceportp, uint64_t flags)
+{
+        bool per_pid_service = flags & BOOTSTRAP_PER_PID_SERVICE;
+        struct ldcred *ldc = runtime_get_caller_creds();
         struct machservice *ms;
-        struct ldcred *ldc = runtime_get_caller_creds();
         job_t jo;
 
@@ -5912 +5920 @@
         }
 
-        ms = jobmgr_lookup_service(j->mgr, servicename, true, 0);
+        ms = jobmgr_lookup_service(j->mgr, servicename, false, per_pid_service ? ldc->pid : 0);
 
         if (ms == NULL) {
                 *serviceportp = MACH_PORT_NULL;
-                ms = machservice_new(j, servicename, serviceportp, false);
-
-                if (unlikely(ms == NULL)) {
+
+                if (unlikely((ms = machservice_new(j, servicename, serviceportp, per_pid_service)) == NULL)) {
                         return BOOTSTRAP_NO_MEMORY;
                 }
 
+                ms->delete_on_destruction = true; /* parity with bootstrap_register() */
                 job_checkin(j);
 

trunk/launchd/src/libbootstrap.c

@@ -117 +117 @@
 bootstrap_check_in(mach_port_t bp, name_t service_name, mach_port_t *sp)
 {
-        return vproc_mig_check_in(bp, service_name, sp);
+        return vproc_mig_check_in2(bp, service_name, sp, 0);
+}
+
+kern_return_t
+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);
 }
 

trunk/launchd/src/libbootstrap_private.h

@@ -36 +36 @@
 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);
 
+kern_return_t bootstrap_check_in2(mach_port_t bp, name_t service_name, mach_port_t *sp, uint64_t flags);
+
 kern_return_t bootstrap_look_up_per_user(mach_port_t bp, name_t service_name, uid_t target_user, mach_port_t *sp);
 

trunk/launchd/src/protocol_job.defs

@@ -51 +51 @@
                 __flags         : uint64_t);
 
-routine check_in(
-                        __bs_port       : job_t;
-                        __service_name  : name_t;
-                out     __service_port  : mach_port_move_receive_t);
+routine check_in2(
+                __bs_port       : job_t;
+                __service_name  : name_t;
+        out     __service_port  : mach_port_move_receive_t;
+                __flags         : uint64_t);
 
 routine register2(