<!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, #msg p { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul { 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>[23482] trunk/launchd/src</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.macosforge.org/projects/launchd/changeset/23482">23482</a></dd>
<dt>Author</dt> <dd>zarzycki@apple.com</dd>
<dt>Date</dt> <dd>2008-01-14 09:44:45 -0800 (Mon, 14 Jan 2008)</dd>
</dl>
<h3>Log Message</h3>
<pre>Misc. changes</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>
</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 (23481 => 23482)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/launchd/src/launchd_core_logic.c 2008-01-11 17:12:59 UTC (rev 23481)
+++ trunk/launchd/src/launchd_core_logic.c 2008-01-14 17:44:45 UTC (rev 23482)
</span><span class="lines">@@ -535,7 +535,7 @@
</span><span class="cx"> INTERNAL_ABI void
</span><span class="cx"> job_stop(job_t j)
</span><span class="cx"> {
</span><del>- if (!j->p || j->anonymous) {
</del><ins>+ if (unlikely(!j->p || j->anonymous)) {
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1938,8 +1938,7 @@
</span><span class="cx"> job_t ji;
</span><span class="cx">
</span><span class="cx"> if (jm->jm_port == mport) {
</span><del>- jobmgr_assumes(jm, (ji = jobmgr_find_by_pid(jm, upid, true)) != NULL);
- return ji;
</del><ins>+ return jobmgr_find_by_pid(jm, upid, true);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> SLIST_FOREACH(jmi, &jm->submgrs, sle) {
</span><span class="lines">@@ -2340,7 +2339,7 @@
</span><span class="cx"> void
</span><span class="cx"> job_kill(job_t j)
</span><span class="cx"> {
</span><del>- if (!j->p || j->anonymous) {
</del><ins>+ if (unlikely(!j->p || j->anonymous)) {
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -4850,12 +4849,6 @@
</span><span class="cx"> return NULL;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-INTERNAL_ABI bool
-job_is_anonymous(job_t j)
-{
- return j->anonymous;
-}
-
</del><span class="cx"> void
</span><span class="cx"> job_force_sampletool(job_t j)
</span><span class="cx"> {
</span><span class="lines">@@ -5956,13 +5949,15 @@
</span><span class="cx"> ms = jobmgr_lookup_service(j->mgr, servicename, true, 0);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (ms && machservice_hidden(ms) && !job_active(machservice_job(ms))) {
- ms = NULL;
- } else if (ms && unlikely(ms->per_user_hack)) {
- ms = NULL;
</del><ins>+ if (likely(ms)) {
+ if (machservice_hidden(ms) && !job_active(machservice_job(ms))) {
+ ms = NULL;
+ } else if (unlikely(ms->per_user_hack)) {
+ ms = NULL;
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- if (ms) {
</del><ins>+ if (likely(ms)) {
</ins><span class="cx"> job_assumes(j, machservice_port(ms) != MACH_PORT_NULL);
</span><span class="cx"> job_log(j, LOG_DEBUG, "%sMach service lookup: %s", flags & BOOTSTRAP_PER_PID_SERVICE ? "Per PID " : "", servicename);
</span><span class="cx">
</span></span></pre></div>
<a id="trunklaunchdsrclaunchd_runtimec"></a>
<div class="modfile"><h4>Modified: trunk/launchd/src/launchd_runtime.c (23481 => 23482)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/launchd/src/launchd_runtime.c 2008-01-11 17:12:59 UTC (rev 23481)
+++ trunk/launchd/src/launchd_runtime.c 2008-01-14 17:44:45 UTC (rev 23482)
</span><span class="lines">@@ -1049,16 +1049,19 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /* we have another request message */
</span><del>-
</del><ins>+#if 0
</ins><span class="cx"> if (!launchd_assumes(mig_cb_table != NULL)) {
</span><span class="cx"> break;
</span><span class="cx"> }
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> the_demux = mig_cb_table[MACH_PORT_INDEX(bufRequest->Head.msgh_local_port)];
</span><span class="cx">
</span><ins>+#if 0
</ins><span class="cx"> if (!launchd_assumes(the_demux != NULL)) {
</span><span class="cx"> break;
</span><span class="cx"> }
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> record_caller_creds(&bufRequest->Head);
</span><span class="cx">
</span><span class="lines">@@ -1334,7 +1337,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (!shutdown_in_progress && !fake_shutdown_in_progress) {
</del><ins>+ if (likely(!shutdown_in_progress && !fake_shutdown_in_progress)) {
</ins><span class="cx"> runtime_log_uncork_pending_drain();
</span><span class="cx"> return;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>