Changeset 23475

Timestamp:

12/21/07 13:37:17 (12 months ago)

Author:

zarzycki@…

Message:

Added likely() / unlikely() usage.

Files:

• trunk/launchd/src/launchd_core_logic.c (modified) (14 diffs)

trunk/launchd/src/launchd_core_logic.c

@@ -583 +583 @@
                 launch_data_dict_insert(r, tmp, LAUNCH_JOBKEY_STANDARDERRORPATH);
         }
-        if (j->argv && (tmp = launch_data_alloc(LAUNCH_DATA_ARRAY))) {
+        if (likely(j->argv) && (tmp = launch_data_alloc(LAUNCH_DATA_ARRAY))) {
                 int i;
 
@@ -858 +858 @@
                 free(j->prog);
         }
-        if (j->argv) {
+        if (likely(j->argv)) {
                 free(j->argv);
         }
@@ -1081 +1081 @@
         }
 
-        if (kp.kp_proc.p_stat == SZOMB) {
+        if (unlikely(kp.kp_proc.p_stat == SZOMB)) {
                 jobmgr_log(jm, LOG_DEBUG, "Tried to create an anonymous job for zombie PID %u: %s", anonpid, kp.kp_proc.p_comm);
         }
@@ -1137 +1137 @@
                 LIST_INSERT_HEAD(&jm->active_jobs[ACTIVE_JOB_HASH(jr->p)], jr, pid_hash_sle);
 
-                if (kevent_mod(jr->p, EVFILT_PROC, EV_ADD, proc_fflags, 0, root_jobmgr) == -1 && job_assumes(jr, errno == ESRCH)) {
+                if (unlikely(kevent_mod(jr->p, EVFILT_PROC, EV_ADD, proc_fflags, 0, root_jobmgr) == -1) && job_assumes(jr, errno == ESRCH)) {
                         /* zombies are weird */
                         job_log(jr, LOG_ERR, "Failed to add kevent for PID %u. Will unload at MIG return", jr->p);
@@ -1174 +1174 @@
         launchd_assert(offsetof(struct job_s, kqjob_callback) == 0);
 
-        if (jm->shutting_down) {
+        if (unlikely(jm->shutting_down)) {
                 errno = EINVAL;
                 return NULL;
         }
 
-        if (prog == NULL && argv == NULL) {
+        if (unlikely(prog == NULL && argv == NULL)) {
                 errno = EINVAL;
                 return NULL;
@@ -1221 +1221 @@
         }
 
-        if (argv) {
-                while (*argv_tmp++)
+        if (likely(argv)) {
+                while (*argv_tmp++) {
                         j->argc++;
+                }
 
                 for (i = 0; i < j->argc; i++) {
@@ -1523 +1524 @@
         case 'E':
                 if (strcasecmp(key, LAUNCH_JOBKEY_EXITTIMEOUT) == 0) {
-                        if (value < 0) {
+                        if (unlikely(value < 0)) {
                                 job_log(j, LOG_WARNING, "%s less than zero. Ignoring.", LAUNCH_JOBKEY_EXITTIMEOUT);
-                        } else if (value > UINT32_MAX) {
+                        } else if (unlikely(value > UINT32_MAX)) {
                                 job_log(j, LOG_WARNING, "%s is too large. Ignoring.", LAUNCH_JOBKEY_EXITTIMEOUT);
                         } else {
@@ -1542 +1543 @@
         case 'T':
                 if (strcasecmp(key, LAUNCH_JOBKEY_TIMEOUT) == 0) {
-                        if (value < 0) {
+                        if (unlikely(value < 0)) {
                                 job_log(j, LOG_WARNING, "%s less than zero. Ignoring.", LAUNCH_JOBKEY_TIMEOUT);
-                        } else if (value > UINT32_MAX) {
+                        } else if (unlikely(value > UINT32_MAX)) {
                                 job_log(j, LOG_WARNING, "%s is too large. Ignoring.", LAUNCH_JOBKEY_TIMEOUT);
                         } else {
@@ -1569 +1570 @@
         case 'S':
                 if (strcasecmp(key, LAUNCH_JOBKEY_STARTINTERVAL) == 0) {
-                        if (value <= 0) {
+                        if (unlikely(value <= 0)) {
                                 job_log(j, LOG_WARNING, "%s is not greater than zero. Ignoring.", LAUNCH_JOBKEY_STARTINTERVAL);
-                        } else if (value > UINT32_MAX) {
+                        } else if (unlikely(value > UINT32_MAX)) {
                                 job_log(j, LOG_WARNING, "%s is too large. Ignoring.", LAUNCH_JOBKEY_STARTINTERVAL);
                         } else {
@@ -1760 +1761 @@
         launch_data_type_t kind;
 
-        if (obj == NULL) {
+        if (!launchd_assumes(obj != NULL)) {
                 return;
         }
@@ -1799 +1800 @@
         job_t j;
 
-        if (pload == NULL) {
+        if (!launchd_assumes(pload != NULL)) {
                 errno = EINVAL;
                 return NULL;
@@ -1855 +1856 @@
         }
 
-        if ((j = job_find(label)) != NULL) {
+        if (unlikely((j = job_find(label)) != NULL)) {
                 errno = EEXIST;
                 return NULL;
@@ -2757 +2758 @@
                 g.gl_pathv[0] = (char *)file2exec;
                 argv = (const char **)g.gl_pathv;
-        } else if (j->argv) {
+        } else if (likely(j->argv)) {
                 argv = alloca((j->argc + 2) * sizeof(char *));
                 argv[0] = file2exec;
@@ -3999 +4000 @@
         if (j->prog) {
                 return j->prog;
-        } else if (j->argv) {
+        } else if (likely(j->argv)) {
                 return j->argv[0];
         } else {