Changeset 23124

Timestamp:

03/03/07 15:09:49 (21 months ago)

Author:

zarzycki@…

Message:

Transform jobmgr_fork() to runtime_fork(). Someday, I'll create runtime_spawn() that wraps and extends posix_spawn().

Location:

trunk/launchd/src

Files:

• launchd_core_logic.c (modified) (3 diffs)
• launchd_runtime.c (modified) (1 diff)
• launchd_runtime.h (modified) (1 diff)

trunk/launchd/src/launchd_core_logic.c

@@ -222 +222 @@
 static void job_export_all2(jobmgr_t jm, launch_data_t where);
 static void jobmgr_callback(void *obj, struct kevent *kev);
-static pid_t jobmgr_fork(jobmgr_t jm);
 static void jobmgr_setup_env_from_other_jobs(jobmgr_t jm);
 static struct machservice *jobmgr_lookup_service(jobmgr_t jm, const char *name, bool check_parent, pid_t target_pid);
@@ -1987 +1986 @@
         time(&j->start_time);
 
-        switch (c = jobmgr_fork(j->mgr)) {
+        switch (c = runtime_fork(j->mgr->jm_port)) {
         case -1:
                 job_log_error(j, LOG_ERR, "fork() failed, will try again in one second");
@@ -3089 +3088 @@
 }
 
-pid_t
-jobmgr_fork(jobmgr_t jm)
-{
-        mach_port_t p = jm->jm_port;
-        pid_t r = -1;
-        int saved_errno;
-
-        jobmgr_assumes(jm, launchd_mport_make_send(p) == KERN_SUCCESS);
-        jobmgr_assumes(jm, launchd_set_bport(p) == KERN_SUCCESS);
-        jobmgr_assumes(jm, launchd_mport_deallocate(p) == KERN_SUCCESS);
-
-        r = fork();
-
-        saved_errno = errno;
-
-        if (r != 0) {
-                jobmgr_assumes(jm, launchd_set_bport(MACH_PORT_NULL) == KERN_SUCCESS);
-        }
-
-        errno = saved_errno;
-        return r;
-}
-
 void
 machservice_watch(job_t j, struct machservice *ms)

trunk/launchd/src/launchd_runtime.c

@@ -554 +554 @@
 }
 
+pid_t
+runtime_fork(mach_port_t bsport)
+{
+        pid_t r = -1;
+        int saved_errno;
+
+        launchd_assumes(launchd_mport_make_send(bsport) == KERN_SUCCESS);
+        launchd_assumes(launchd_set_bport(bsport) == KERN_SUCCESS);
+        launchd_assumes(launchd_mport_deallocate(bsport) == KERN_SUCCESS);
+
+        r = fork();
+
+        saved_errno = errno;
+
+        if (r != 0) {
+                launchd_assumes(launchd_set_bport(MACH_PORT_NULL) == KERN_SUCCESS);
+        }
+
+        errno = saved_errno;
+
+        return r;
+}
+
+
 void
 runtime_set_timeout(timeout_callback to_cb, mach_msg_timeout_t to)

trunk/launchd/src/launchd_runtime.h

@@ -72 +72 @@
 int kevent_mod(uintptr_t ident, short filter, u_short flags, u_int fflags, intptr_t data, void *udata);
 
+pid_t runtime_fork(mach_port_t bsport);
+
 void runtime_openlog(const char *ident, int logopt, int facility);
 void runtime_closelog(void);