Changeset 23482

Timestamp:

01/14/08 09:44:45 (11 months ago)

Author:

zarzycki@…

Message:

Misc. changes

Location:

trunk/launchd/src

Files:

• launchd_core_logic.c (modified) (5 diffs)
• launchd_runtime.c (modified) (2 diffs)

trunk/launchd/src/launchd_core_logic.c

@@ -536 +536 @@
 job_stop(job_t j)
 {
-        if (!j->p || j->anonymous) {
+        if (unlikely(!j->p || j->anonymous)) {
                 return;
         }
@@ -1939 +1939 @@
 
         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);
         }
 
@@ -2341 +2340 @@
 job_kill(job_t j)
 {
-        if (!j->p || j->anonymous) {
+        if (unlikely(!j->p || j->anonymous)) {
                 return;
         }
@@ -4851 +4850 @@
 }
 
-INTERNAL_ABI bool
-job_is_anonymous(job_t j)
-{
-        return j->anonymous;
-}
-
 void
 job_force_sampletool(job_t j)
@@ -5957 +5950 @@
         }
 
-        if (ms && machservice_hidden(ms) && !job_active(machservice_job(ms))) {
-                ms = NULL;
-        } else if (ms && unlikely(ms->per_user_hack)) {
-                ms = NULL;
-        }
-
-        if (ms) {
+        if (likely(ms)) {
+                if (machservice_hidden(ms) && !job_active(machservice_job(ms))) {
+                        ms = NULL;
+                } else if (unlikely(ms->per_user_hack)) {
+                        ms = NULL;
+                }
+        }
+
+        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);

trunk/launchd/src/launchd_runtime.c

@@ -1050 +1050 @@
 
                 /* 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);
@@ -1335 +1338 @@
         }
 
-        if (!shutdown_in_progress && !fake_shutdown_in_progress) {
+        if (likely(!shutdown_in_progress && !fake_shutdown_in_progress)) {
                 runtime_log_uncork_pending_drain();
                 return;