<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[23124] trunk/launchd/src</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.macosforge.org/projects/launchd/changeset/23124">23124</a></dd>
<dt>Author</dt> <dd>zarzycki@apple.com</dd>
<dt>Date</dt> <dd>2007-03-03 15:09:49 -0800 (Sat, 03 Mar 2007)</dd>
</dl>
<h3>Log Message</h3>
<pre>Transform jobmgr_fork() to runtime_fork(). Someday, I'll create runtime_spawn() that wraps and extends posix_spawn().</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunklaunchdsrclaunchd_core_logicc">trunk/launchd/src/launchd_core_logic.c</a></li>
<li><a href="#trunklaunchdsrclaunchd_runtimec">trunk/launchd/src/launchd_runtime.c</a></li>
<li><a href="#trunklaunchdsrclaunchd_runtimeh">trunk/launchd/src/launchd_runtime.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunklaunchdsrclaunchd_core_logicc"></a>
<div class="modfile"><h4>Modified: trunk/launchd/src/launchd_core_logic.c (23123 => 23124)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/launchd/src/launchd_core_logic.c 2007-03-02 23:46:29 UTC (rev 23123)
+++ trunk/launchd/src/launchd_core_logic.c 2007-03-03 23:09:49 UTC (rev 23124)
</span><span class="lines">@@ -221,7 +221,6 @@
</span><span class="cx"> static job_t job_mig_intran2(jobmgr_t jm, mach_port_t p);
</span><span class="cx"> static void job_export_all2(jobmgr_t jm, launch_data_t where);
</span><span class="cx"> static void jobmgr_callback(void *obj, struct kevent *kev);
</span><del>-static pid_t jobmgr_fork(jobmgr_t jm);
</del><span class="cx"> static void jobmgr_setup_env_from_other_jobs(jobmgr_t jm);
</span><span class="cx"> static struct machservice *jobmgr_lookup_service(jobmgr_t jm, const char *name, bool check_parent, pid_t target_pid);
</span><span class="cx"> static void jobmgr_logv(jobmgr_t jm, int pri, int err, const char *msg, va_list ap) __attribute__((format(printf, 4, 0)));
</span><span class="lines">@@ -1986,7 +1985,7 @@
</span><span class="cx">
</span><span class="cx"> time(&j->start_time);
</span><span class="cx">
</span><del>- switch (c = jobmgr_fork(j->mgr)) {
</del><ins>+ switch (c = runtime_fork(j->mgr->jm_port)) {
</ins><span class="cx"> case -1:
</span><span class="cx"> job_log_error(j, LOG_ERR, "fork() failed, will try again in one second");
</span><span class="cx"> job_assumes(j, close(execspair[0]) == 0);
</span><span class="lines">@@ -3088,29 +3087,6 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-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;
-}
-
</del><span class="cx"> void
</span><span class="cx"> machservice_watch(job_t j, struct machservice *ms)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunklaunchdsrclaunchd_runtimec"></a>
<div class="modfile"><h4>Modified: trunk/launchd/src/launchd_runtime.c (23123 => 23124)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/launchd/src/launchd_runtime.c 2007-03-02 23:46:29 UTC (rev 23123)
+++ trunk/launchd/src/launchd_runtime.c 2007-03-03 23:09:49 UTC (rev 23124)
</span><span class="lines">@@ -553,6 +553,30 @@
</span><span class="cx"> return errno;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+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;
+}
+
+
</ins><span class="cx"> void
</span><span class="cx"> runtime_set_timeout(timeout_callback to_cb, mach_msg_timeout_t to)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunklaunchdsrclaunchd_runtimeh"></a>
<div class="modfile"><h4>Modified: trunk/launchd/src/launchd_runtime.h (23123 => 23124)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/launchd/src/launchd_runtime.h 2007-03-02 23:46:29 UTC (rev 23123)
+++ trunk/launchd/src/launchd_runtime.h 2007-03-03 23:09:49 UTC (rev 23124)
</span><span class="lines">@@ -71,6 +71,8 @@
</span><span class="cx">
</span><span class="cx"> int kevent_mod(uintptr_t ident, short filter, u_short flags, u_int fflags, intptr_t data, void *udata);
</span><span class="cx">
</span><ins>+pid_t runtime_fork(mach_port_t bsport);
+
</ins><span class="cx"> void runtime_openlog(const char *ident, int logopt, int facility);
</span><span class="cx"> void runtime_closelog(void);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>