Revision: 23482 http://trac.macosforge.org/projects/launchd/changeset/23482 Author: zarzycki@apple.com Date: 2008-01-14 09:44:45 -0800 (Mon, 14 Jan 2008) Log Message: ----------- Misc. changes Modified Paths: -------------- trunk/launchd/src/launchd_core_logic.c trunk/launchd/src/launchd_runtime.c Modified: trunk/launchd/src/launchd_core_logic.c =================================================================== --- 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) @@ -535,7 +535,7 @@ INTERNAL_ABI void job_stop(job_t j) { - if (!j->p || j->anonymous) { + if (unlikely(!j->p || j->anonymous)) { return; } @@ -1938,8 +1938,7 @@ job_t ji; if (jm->jm_port == mport) { - jobmgr_assumes(jm, (ji = jobmgr_find_by_pid(jm, upid, true)) != NULL); - return ji; + return jobmgr_find_by_pid(jm, upid, true); } SLIST_FOREACH(jmi, &jm->submgrs, sle) { @@ -2340,7 +2339,7 @@ void job_kill(job_t j) { - if (!j->p || j->anonymous) { + if (unlikely(!j->p || j->anonymous)) { return; } @@ -4850,12 +4849,6 @@ return NULL; } -INTERNAL_ABI bool -job_is_anonymous(job_t j) -{ - return j->anonymous; -} - void job_force_sampletool(job_t j) { @@ -5956,13 +5949,15 @@ ms = jobmgr_lookup_service(j->mgr, servicename, true, 0); } - if (ms && machservice_hidden(ms) && !job_active(machservice_job(ms))) { - ms = NULL; - } else if (ms && unlikely(ms->per_user_hack)) { - ms = NULL; + if (likely(ms)) { + if (machservice_hidden(ms) && !job_active(machservice_job(ms))) { + ms = NULL; + } else if (unlikely(ms->per_user_hack)) { + ms = NULL; + } } - if (ms) { + if (likely(ms)) { job_assumes(j, machservice_port(ms) != MACH_PORT_NULL); job_log(j, LOG_DEBUG, "%sMach service lookup: %s", flags & BOOTSTRAP_PER_PID_SERVICE ? "Per PID " : "", servicename); Modified: trunk/launchd/src/launchd_runtime.c =================================================================== --- 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) @@ -1049,16 +1049,19 @@ } /* we have another request message */ - +#if 0 if (!launchd_assumes(mig_cb_table != NULL)) { break; } +#endif the_demux = mig_cb_table[MACH_PORT_INDEX(bufRequest->Head.msgh_local_port)]; +#if 0 if (!launchd_assumes(the_demux != NULL)) { break; } +#endif record_caller_creds(&bufRequest->Head); @@ -1334,7 +1337,7 @@ return; } - if (!shutdown_in_progress && !fake_shutdown_in_progress) { + if (likely(!shutdown_in_progress && !fake_shutdown_in_progress)) { runtime_log_uncork_pending_drain(); return; }