Changeset 23535

Timestamp:

2008-03-05 18:16:37 (7 months ago)

Author:

zarzycki@…

Message:

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

Location:

trunk/launchd/src

Files:

• launchctl.c (modified) (1 diff)
• launchd_core_logic.c (modified) (4 diffs)
• launchd_runtime.c (modified) (1 diff)
• libbootstrap.c (modified) (2 diffs)
• libbootstrap_public.h (modified) (2 diffs)
• libvproc_public.h (modified) (2 diffs)
• protocol_job.defs (modified) (1 diff)

trunk/launchd/src/launchctl.c

@@ -1795 +1795 @@
                         continue;
                 }
-                if ((kr = bootstrap_create_service(msr, (char*)sn, &msv)) != KERN_SUCCESS) {
+                if ((kr = bootstrap_check_in(msr, (char*)sn, &msv)) != KERN_SUCCESS) {
                         fprintf(stderr, "%s: bootstrap_create_service(): %d\n", getprogname(), kr);
-                        mach_port_destroy(mach_task_self(), msr);
+                        mach_port_mod_refs(mach_task_self(), msv, MACH_PORT_RIGHT_RECEIVE, -1);
                         continue;
                 }

trunk/launchd/src/launchd_core_logic.c

@@ -426 +426 @@
 static job_t job_new(jobmgr_t jm, const char *label, const char *prog, const char *const *argv) __attribute__((malloc, nonnull(1,2), warn_unused_result));
 static job_t job_new_via_mach_init(job_t j, const char *cmd, uid_t uid, bool ond) __attribute__((malloc, nonnull, warn_unused_result));
-static const char *job_prog(job_t j);
 static void job_kill(job_t j);
 static void job_uncork_fork(job_t j);
@@ -4134 +4133 @@
 
 const char *
-job_prog(job_t j)
-{
-        if (j->prog) {
-                return j->prog;
-        } else if (likely(j->argv)) {
-                return j->argv[0];
-        } else {
-                return "";
-        }
-}
-
-const char *
 job_active(job_t j)
 {
@@ -5927 +5914 @@
         ms = jobmgr_lookup_service(j->mgr, servicename, true, 0);
 
-        if (unlikely(ms == NULL)) {
-                job_log(j, LOG_DEBUG, "Check-in of Mach service failed. Unknown: %s", servicename);
-                return BOOTSTRAP_UNKNOWN_SERVICE;
+        if (ms == NULL) {
+                *serviceportp = MACH_PORT_NULL;
+                ms = machservice_new(j, servicename, serviceportp, false);
+
+                if (unlikely(ms == NULL)) {
+                        return BOOTSTRAP_NO_MEMORY;
+                }
+
+                job_checkin(j);
         }
 
@@ -6576 +6569 @@
 
 kern_return_t
-job_mig_create_service(job_t j, name_t servicename, mach_port_t *serviceportp)
-{
-        struct machservice *ms;
-
-        if (!launchd_assumes(j != NULL)) {
-                return BOOTSTRAP_NO_MEMORY;
-        }
-
-        if (unlikely(job_prog(j)[0] == '\0')) {
-                job_log(j, LOG_ERR, "Mach service creation requires a target server: %s", servicename);
-                return BOOTSTRAP_NOT_PRIVILEGED;
-        }
-
-        if (unlikely(!j->legacy_mach_job)) {
-                job_log(j, LOG_ERR, "bootstrap_create_service() is only allowed against legacy Mach jobs: %s", servicename);
-                return BOOTSTRAP_NOT_PRIVILEGED;
-        }
-
-        ms = jobmgr_lookup_service(j->mgr, servicename, false, 0);
-        if (unlikely(ms)) {
-                job_log(j, LOG_DEBUG, "Mach service creation attempt for failed. Already exists: %s", servicename);
-                return BOOTSTRAP_NAME_IN_USE;
-        }
-
-        job_checkin(j);
-
-        *serviceportp = MACH_PORT_NULL;
-        ms = machservice_new(j, servicename, serviceportp, false);
-
-        if (!job_assumes(j, ms != NULL)) {
-                return BOOTSTRAP_NO_MEMORY;
-        }
-
-        return BOOTSTRAP_SUCCESS;
-}
-
-kern_return_t
 job_mig_embedded_wait(job_t j, name_t targetlabel, integer_t *waitstatus)
 {

trunk/launchd/src/launchd_runtime.c

@@ -1 +1 @@
 /*
- * Copyright (c) 1999-2006 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 1999-2008 Apple Computer, Inc. All rights reserved.
  *
  * @APPLE_APACHE_LICENSE_HEADER_START@

trunk/launchd/src/libbootstrap.c

@@ -101 +101 @@
 bootstrap_create_service(mach_port_t bp, name_t service_name, mach_port_t *sp)
 {
-        return vproc_mig_create_service(bp, service_name, sp);
+        kern_return_t kr;
+
+        if ((kr = bootstrap_check_in(bp, service_name, sp))) {
+                return kr;
+        }
+
+        if ((kr = mach_port_mod_refs(mach_task_self(), *sp, MACH_PORT_RIGHT_RECEIVE, -1))) {
+                return kr;
+        }
+
+        return bootstrap_look_up(bp, service_name, sp);
 }
 
@@ -161 +171 @@
 bootstrap_status(mach_port_t bp, name_t service_name, bootstrap_status_t *service_active)
 {
+        kern_return_t kr;
         mach_port_t p;
+
+        if ((kr = bootstrap_look_up(bp, service_name, &p))) {
+                return kr;
+        }
+
+        mach_port_deallocate(mach_task_self(), p);
+        *service_active = BOOTSTRAP_STATUS_ACTIVE;
 
         if (bootstrap_check_in(bp, service_name, &p) == BOOTSTRAP_SUCCESS) {
                 mach_port_mod_refs(mach_task_self(), p, MACH_PORT_RIGHT_RECEIVE, -1);
                 *service_active = BOOTSTRAP_STATUS_ON_DEMAND;
-                return BOOTSTRAP_SUCCESS;
-        } else if (bootstrap_look_up(bp, service_name, &p) == BOOTSTRAP_SUCCESS) {
-                mach_port_deallocate(mach_task_self(), p);
-                *service_active = BOOTSTRAP_STATUS_ACTIVE;
-                return BOOTSTRAP_SUCCESS;
-        }
-
-        return BOOTSTRAP_UNKNOWN_SERVICE;
+        }
+
+        return BOOTSTRAP_SUCCESS;
 }
 

trunk/launchd/src/libbootstrap_public.h

@@ -234 +234 @@
  * This API is deprecated. Old scenarios and recommendations:
  *
- * 1) If the code was registering a well known name, please switch to launchd.
- *
- * 2) If the code was registering a dynamically generated string and passing
+ * 1) Code that used to call bootstrap_check_in() and then bootstrap_register()
+ *    can now always call bootstrap_check_in().
+ *
+ * 2) If the code was registering a well known name, please switch to launchd.
+ *
+ * 3) If the code was registering a dynamically generated string and passing
  *    the string to other applications, please rewrite the code to send a Mach
  *    send-right directly.
  *
- * 3) If the launchd job maintained an optional Mach service, please reserve
+ * 4) If the launchd job maintained an optional Mach service, please reserve
  *    the name with launchd and control the presense of the service through
  *    ownership of the Mach receive right like so.
@@ -262 +265 @@
  *                      register or checked-in.
  */
-kern_return_t bootstrap_register(
-                mach_port_t bp,
-                name_t service_name,
-                mach_port_t sp)
-                AVAILABLE_MAC_OS_X_VERSION_10_0_AND_LATER_BUT_DEPRECATED_IN_MAC_OS_X_VERSION_10_5;
+AVAILABLE_MAC_OS_X_VERSION_10_0_AND_LATER_BUT_DEPRECATED_IN_MAC_OS_X_VERSION_10_5
+kern_return_t
+bootstrap_register(mach_port_t bp, name_t service_name, mach_port_t sp);
 
 /*
  * bootstrap_create_service()
  *
- * Creates a service named "service_name" and returns send rights to that
+ * Creates a service named "service_name" and returns a send right to that
  * port in "service_port."  The port may later be checked in as if this
  * port were configured in the bootstrap configuration file.
  *
+ * This API is deprecated. Please call bootstrap_check_in() instead.
+ *
  * Errors:      Returns appropriate kernel errors on rpc failure.
  *              Returns BOOTSTRAP_SERVICE_ACTIVE, if service already exists.
  */
-kern_return_t bootstrap_create_service(
-                mach_port_t bp,
-                name_t service_name,
-                mach_port_t *sp);
+#ifdef AVAILABLE_MAC_OS_X_VERSION_10_0_AND_LATER_BUT_DEPRECATED_IN_MAC_OS_X_VERSION_10_6
+AVAILABLE_MAC_OS_X_VERSION_10_0_AND_LATER_BUT_DEPRECATED_IN_MAC_OS_X_VERSION_10_6
+#endif
+kern_return_t
+bootstrap_create_service(mach_port_t bp, name_t service_name, mach_port_t *sp);
 
 /*

trunk/launchd/src/libvproc_public.h

@@ -95 +95 @@
  * @function vproc_transaction_complete
  *
- * @param
+ * @param       handle
  * The handle previously created with vproc_transaction_prepare().
  *
@@ -131 +131 @@
  * @function vproc_standby_complete
  *
- * @param
+ * @param       handle
  * The handle previously created with vproc_standby_prepare().
  *

trunk/launchd/src/protocol_job.defs

@@ -95 +95 @@
         out     __subset_port   : mach_port_make_send_t);
 
-routine create_service(
-                __bs_port       : job_t;
-                __service_name  : name_t;
-        out     __service_port  : mach_port_t);
+skip;   /* create_service prior to 10.6 */
 
 routine take_subset(