Changeset 23480

Timestamp:

01/11/08 07:17:14 (11 months ago)

Author:

zarzycki@…

Message:

Misc updates.

Location:

trunk/launchd/src

Files:

• launchd.c (modified) (4 diffs)
• launchd_core_logic.c (modified) (91 diffs)
• launchd_runtime.h (modified) (1 diff)
• launchd_unix_ipc.c (modified) (10 diffs)
• launchd_unix_ipc.h (modified) (1 diff)

trunk/launchd/src/launchd.c

@@ -83 +83 @@
 extern char **environ;
 
-static void pfsystem_callback(void *, struct kevent *);
+INTERNAL_ABI static void pfsystem_callback(void *, struct kevent *);
 
 static kq_callback kqpfsystem_callback = pfsystem_callback;
@@ -377 +377 @@
 }
 
-void
+INTERNAL_ABI void
 pfsystem_callback(void *obj __attribute__((unused)), struct kevent *kev)
 {
@@ -393 +393 @@
 }
 
-INTERNAL_ABI bool
+INTERNAL_ABI void
 _log_launchd_bug(const char *rcs_rev, const char *path, unsigned int line, const char *test)
 {
@@ -418 +418 @@
 
         runtime_syslog(LOG_NOTICE, "Bug: %s:%u (%s):%u: %s", file, line, buf, saved_errno, test);
-
-        return false;
-}
+}

trunk/launchd/src/launchd_core_logic.c

@@ -264 +264 @@
         LIST_HEAD(, job_s) active_jobs[ACTIVE_JOB_HASH_SIZE];
         LIST_HEAD(, machservice) ms_hash[MACHSERVICE_HASH_SIZE];
+        LIST_HEAD(, job_s) global_env_jobs;
         mach_port_t jm_port;
         mach_port_t req_port;
@@ -276 +277 @@
 
 #define jobmgr_assumes(jm, e)   \
-        (likely(e) ? true : jobmgr_log_bug(jm, __LINE__))
+        (unlikely(!(e)) ? jobmgr_log_bug(jm, __LINE__), false : true)
 
 static jobmgr_t jobmgr_new(jobmgr_t jm, mach_port_t requestorport, mach_port_t transfer_port, bool sflag, const char *name);
@@ -290 +291 @@
 static job_t job_mig_intran2(jobmgr_t jm, mach_port_t mport, pid_t upid);
 static void job_export_all2(jobmgr_t jm, launch_data_t where);
-static void jobmgr_callback(void *obj, struct kevent *kev);
+INTERNAL_ABI static void jobmgr_callback(void *obj, struct kevent *kev);
 static void jobmgr_setup_env_from_other_jobs(jobmgr_t jm);
 static void jobmgr_export_env_from_other_jobs(jobmgr_t jm, launch_data_t dict);
@@ -297 +298 @@
 static void jobmgr_log(jobmgr_t jm, int pri, const char *msg, ...) __attribute__((format(printf, 3, 4)));
 /* static void jobmgr_log_error(jobmgr_t jm, int pri, const char *msg, ...) __attribute__((format(printf, 3, 4))); */
-static bool jobmgr_log_bug(jobmgr_t jm, unsigned int line);
+static void jobmgr_log_bug(jobmgr_t jm, unsigned int line);
 
 #define DO_RUSAGE_SUMMATION 0
@@ -308 +309 @@
         LIST_ENTRY(job_s) pid_hash_sle;
         LIST_ENTRY(job_s) label_hash_sle;
+        LIST_ENTRY(job_s) global_env_sle;
         SLIST_HEAD(, socketgroup) sockets;
         SLIST_HEAD(, calendarinterval) cal_intervals;
@@ -376 +378 @@
 
 #define job_assumes(j, e)       \
-        (likely(e) ? true : job_log_bug(j, __LINE__))
+        (unlikely(!(e)) ? job_log_bug(j, __LINE__), false : true)
 
 static void job_import_keys(launch_data_t obj, const char *key, void *context);
@@ -402 +404 @@
 static void job_setup_exception_port(job_t j, task_t target_task);
 static void job_reparent_hack(job_t j, const char *where);
-static void job_callback(void *obj, struct kevent *kev);
+INTERNAL_ABI static void job_callback(void *obj, struct kevent *kev);
 static void job_callback_proc(job_t j, int fflags);
 static void job_callback_timer(job_t j, void *ident);
@@ -418 +420 @@
 static void job_logv(job_t j, int pri, int err, const char *msg, va_list ap) __attribute__((format(printf, 4, 0)));
 static void job_log_error(job_t j, int pri, const char *msg, ...) __attribute__((format(printf, 3, 4)));
-static bool job_log_bug(job_t j, unsigned int line);
+static void job_log_bug(job_t j, unsigned int line);
 static void job_log_stdouterr2(job_t j, const char *msg, ...);
 static void job_set_exeception_port(job_t j, mach_port_t port);
@@ -681 +683 @@
 }
 
-static void
+INTERNAL_ABI static void
 still_alive_with_check(void)
 {
@@ -786 +788 @@
         struct envitem *ei;
 
-        if (j->p && j->anonymous) {
-                job_reap(j);
-        } else if (j->p) {
-                job_log(j, LOG_DEBUG, "Removal pended until the job exits");
-
-                if (!j->removal_pending) {
-                        j->removal_pending = true;
-                        job_stop(j);
-                }
-
-                return;
+        if (unlikely(j->p)) {
+                if (j->anonymous) {
+                        job_reap(j);
+                } else {
+                        job_log(j, LOG_DEBUG, "Removal pended until the job exits");
+
+                        if (!j->removal_pending) {
+                                j->removal_pending = true;
+                                job_stop(j);
+                        }
+                        return;
+                }
         }
 
@@ -867 +870 @@
                 free(j->prog);
         }
-        if (likely(j->argv)) {
+        if (j->argv) {
                 free(j->argv);
         }
@@ -1018 +1021 @@
 
         /* jobs can easily be denied creation during shutdown */
-        if (!jr) {
+        if (unlikely(jr == NULL)) {
                 goto out_bad;
         }
@@ -1082 +1085 @@
         }
 
-        if (len != sizeof(kp)) {
+        if (unlikely(len != sizeof(kp))) {
                 jobmgr_log(jm, LOG_DEBUG, "Tried to create an anonymous job for nonexistent PID: %u", anonpid);
                 errno = ESRCH;
@@ -1097 +1100 @@
         }
 
-        if (kp.kp_proc.p_flag & P_SUGID) {
+        if (unlikely(kp.kp_proc.p_flag & P_SUGID)) {
                 jobmgr_log(jm, LOG_APPLEONLY, "Inconsistency: P_SUGID is set on PID %u: %s", anonpid, kp.kp_proc.p_comm);
         }
@@ -1108 +1111 @@
         kp_svgid = kp.kp_eproc.e_pcred.p_svgid;
 
-        if (kp_euid != kp_uid || kp_euid != kp_svuid || kp_uid != kp_svuid || kp_egid != kp_gid || kp_egid != kp_svgid || kp_gid != kp_svgid) {
+        if (unlikely(kp_euid != kp_uid || kp_euid != kp_svuid || kp_uid != kp_svuid || kp_egid != kp_gid || kp_egid != kp_svgid || kp_gid != kp_svgid)) {
                 jobmgr_log(jm, LOG_APPLEONLY, "Inconsistency: Mixed credentials (e/r/s UID %u/%u/%u GID %u/%u/%u) detected on PID %u: %s",
                                 kp_euid, kp_uid, kp_svuid, kp_egid, kp_gid, kp_svgid, anonpid, kp.kp_proc.p_comm);
@@ -1129 +1132 @@
         }
 
-        if (jp && !jp->anonymous && !(kp.kp_proc.p_flag & P_EXEC)) {
+        if (jp && !jp->anonymous && unlikely(!(kp.kp_proc.p_flag & P_EXEC))) {
                 job_log(jp, LOG_APPLEONLY, "Performance and sanity: fork() without exec*(). Please switch to posix_spawn()");
         }
@@ -1135 +1138 @@
 
         /* A total hack: Normally, job_new() returns an error during shutdown, but anonymous jobs are special. */
-        if ((shutdown_state = jm->shutting_down)) {
+        if (unlikely(shutdown_state = jm->shutting_down)) {
                 jm->shutting_down = false;
         }
@@ -1159 +1162 @@
                 }
 
-                if (shutdown_state && jm->hopefully_first_cnt == 0) {
+                if (unlikely(shutdown_state && jm->hopefully_first_cnt == 0)) {
                         job_log(jr, LOG_APPLEONLY, "This process showed up to the party while all the guests were leaving. Odds are that it will have a miserable time.");
                 }
@@ -1166 +1169 @@
         }
 
-        if (shutdown_state) {
+        if (unlikely(shutdown_state)) {
                 jm->shutting_down = true;
         }
@@ -1196 +1199 @@
         }
 
-        if (label == AUTO_PICK_LEGACY_LABEL) {
+        if (unlikely(label == AUTO_PICK_LEGACY_LABEL)) {
                 bn = prog ? prog : basename((char *)argv[0]); /* prog for auto labels is kp.kp_kproc.p_comm */
                 snprintf(auto_label, sizeof(auto_label), "%s.%s", sizeof(void *) == 8 ? "0xdeadbeeffeedface" : "0xbabecafe", bn);
@@ -1212 +1215 @@
         }
 
-        if (label == auto_label) {
+        if (unlikely(label == auto_label)) {
                 snprintf((char *)j->label, strlen(label) + 1, "%p.%s", j, bn);
         } else {
@@ -1430 +1433 @@
         }
 
-        if (!found_key) {
+        if (unlikely(!found_key)) {
                 job_log(j, LOG_WARNING, "Unknown key for boolean: %s", key);
         }
@@ -1532 +1535 @@
         }
 
-        if (where2put) {
+        if (likely(where2put)) {
                 job_assumes(j, (*where2put = strdup(value)) != NULL);
         } else {
@@ -1822 +1825 @@
         job_t j;
 
-        if (!launchd_assumes(pload != NULL)) {
+        if (!jobmgr_assumes(jm, pload != NULL)) {
                 errno = EINVAL;
                 return NULL;
@@ -1902 +1905 @@
 
         LIST_FOREACH(ji, &label_hash[hash_label(label)], label_hash_sle) {
-                if (ji->removal_pending) {
-                        continue; /* 5351245 */
-                } else if (ji->mgr->shutting_down) {
-                        continue; /* 5488633 */
+                if (unlikely(ji->removal_pending || ji->mgr->shutting_down)) {
+                        continue; /* 5351245 and 5488633 respectively */
                 }
 
@@ -1920 +1921 @@
 jobmgr_find_by_pid(jobmgr_t jm, pid_t p, bool create_anon)
 {
-        job_t ji = NULL;
+        job_t ji;
 
         LIST_FOREACH(ji, &jm->active_jobs[ACTIVE_JOB_HASH(p)], pid_hash_sle) {
                 if (ji->p == p) {
-                        break;
-                }
-        }
-
-        if (ji) {
-                return ji;
-        } else if (create_anon) {
-                return job_new_anonymous(jm, p);
-        } else {
-                return NULL;
-        }
+                        return ji;
+                }
+        }
+
+        return create_anon ? job_new_anonymous(jm, p) : NULL;
 }
 
@@ -2014 +2009 @@
          */
 
-        if (j && j != workaround_5477111 && j->unload_at_mig_return) {
+        if (unlikely(j && (j != workaround_5477111) && j->unload_at_mig_return)) {
                 job_log(j, LOG_NOTICE, "Unloading PID %u at MIG return.", j->p);
                 job_remove(j);
@@ -2467 +2462 @@
                 } else {
                         job_force_sampletool(j);
-                        if (j->debug_before_kill) {
+                        if (unlikely(j->debug_before_kill)) {
                                 job_log(j, LOG_NOTICE, "Exit timeout elapsed. Entering the kernel debugger.");
                                 job_assumes(j, host_reboot(mach_host_self(), HOST_REBOOT_DEBUGGER) == KERN_SUCCESS);
@@ -2507 +2502 @@
 }
 
-void
+INTERNAL_ABI void
 jobmgr_callback(void *obj, struct kevent *kev)
 {
@@ -2516 +2511 @@
         case EVFILT_PROC:
                 jobmgr_reap_bulk(jm, kev);
-                if (launchd_assumes(root_jobmgr != NULL)) {
-                        root_jobmgr = jobmgr_do_garbage_collection(root_jobmgr);
-                }
+                root_jobmgr = jobmgr_do_garbage_collection(root_jobmgr);
                 break;
         case EVFILT_SIGNAL:
@@ -2567 +2560 @@
 }
 
-void
+INTERNAL_ABI void
 job_callback(void *obj, struct kevent *kev)
 {
@@ -2888 +2881 @@
         }
 
-        LIST_FOREACH(ji, &jm->jobs, sle) {
+        LIST_FOREACH(ji, &jm->global_env_jobs, global_env_sle) {
                 SLIST_FOREACH(ei, &ji->global_env, sle) {
                         setenv(ei->key, ei->value, 1);
@@ -3240 +3233 @@
 }
 
-bool
+void
 jobmgr_log_bug(jobmgr_t jm, unsigned int line)
 {
@@ -3264 +3257 @@
                 runtime_syslog(LOG_NOTICE, "Bug: %s:%u (%s):%u", file, line, buf, saved_errno);
         }
-
-        return false;
-}
-
-bool
+}
+
+void
 job_log_bug(job_t j, unsigned int line)
 {
@@ -3292 +3283 @@
                 runtime_syslog(LOG_NOTICE, "Bug: %s:%u (%s):%u", file, line, buf, saved_errno);
         }
-
-        return false;
 }
 
@@ -3785 +3774 @@
 
         if (global) {
+                if (SLIST_EMPTY(&j->global_env)) {
+                        LIST_INSERT_HEAD(&j->mgr->global_env_jobs, j, global_env_sle);
+                }
                 SLIST_INSERT_HEAD(&j->global_env, ei, sle);
         } else {
@@ -3800 +3792 @@
         if (global) {
                 SLIST_REMOVE(&j->global_env, ei, envitem, sle);
+                if (SLIST_EMPTY(&j->global_env)) {
+                        LIST_REMOVE(j, global_env_sle);
+                }
         } else {
                 SLIST_REMOVE(&j->env, ei, envitem, sle);
@@ -3951 +3946 @@
          * launchctl.c for the other half of this hack.
          */
-        if (j->mgr->global_on_demand_cnt > 0 && strcmp(j->label, "com.apple.kextd") != 0) {
+        if (unlikely(j->mgr->global_on_demand_cnt > 0 && strcmp(j->label, "com.apple.kextd") != 0)) {
                 return false;
         }
 #else
-        if (j->mgr->global_on_demand_cnt > 0) {
+        if (unlikely(j->mgr->global_on_demand_cnt > 0)) {
                 return false;
         }
@@ -3977 +3972 @@
                 }
                 if (status.mps_msgcount) {
-                        job_log(j, LOG_DEBUG, "KeepAlive check: job restarted due to %d queued Mach messages on service: %s",
+                        job_log(j, LOG_DEBUG, "KeepAlive check: %d queued Mach messages on service: %s",
                                         status.mps_msgcount, ms->name);
                         return true;
@@ -4140 +4135 @@
         ms->per_pid = pid_local;
 
-        if (*serviceport == MACH_PORT_NULL) {
+        if (likely(*serviceport == MACH_PORT_NULL)) {
                 if (!job_assumes(j, launchd_mport_create_recv(&ms->port) == KERN_SUCCESS)) {
                         goto out_bad;
@@ -4188 +4183 @@
         mach_port_t exc_port = the_exception_server;
 
-        if (j->alt_exc_handler) {
+        if (unlikely(j->alt_exc_handler)) {
                 ms = jobmgr_lookup_service(j->mgr, j->alt_exc_handler, true, 0);
-                if (ms) {
+                if (likely(ms)) {
                         exc_port = machservice_port(ms);
                 } else {
                         job_log(j, LOG_WARNING, "Falling back to default Mach exception handler. Could not find: %s", j->alt_exc_handler);
                 }
-        } else if (j->internal_exc_handler) {
+        } else if (unlikely(j->internal_exc_handler)) {
                 exc_port = runtime_get_kernel_port();
-        } else if (!exc_port) {
+        } else if (unlikely(!exc_port)) {
                 return;
         }
@@ -4207 +4202 @@
 #endif
 
-        if (target_task) {
+        if (likely(target_task)) {
                 job_assumes(j, task_set_exception_ports(target_task, EXC_MASK_CRASH, exc_port,
                                         EXCEPTION_STATE_IDENTITY | MACH_EXCEPTION_CODES, f) == KERN_SUCCESS);
@@ -4222 +4217 @@
 job_set_exeception_port(job_t j, mach_port_t port)
 {
-        if (!the_exception_server) {
+        if (unlikely(!the_exception_server)) {
                 the_exception_server = port;
                 job_setup_exception_port(j, 0);
@@ -4299 +4294 @@
         mach_port_t p = MACH_PORT_NULL;
 
-        if ((ms = jobmgr_lookup_service(j->mgr, key, false, 0))) {
+        if (unlikely(ms = jobmgr_lookup_service(j->mgr, key, false, 0))) {
                 job_log(j, LOG_WARNING, "Conflict with job: %s over Mach service: %s", ms->job->label, key);
                 return;
         }
 
-        if ((ms = machservice_new(j, key, &p, false)) == NULL) {
-                job_log_error(j, LOG_WARNING, "Cannot add service: %s", key);
+        if (!job_assumes(j, (ms = machservice_new(j, key, &p, false)) != NULL)) {
                 return;
         }
@@ -4326 +4320 @@
         }
 
-        if (!jm->shutting_down) {
+        if (likely(!jm->shutting_down)) {
                 return jm;
         }
@@ -4394 +4388 @@
         struct kinfo_proc *kp;
 
-        if (jm->parentmgr || getpid() != 1) {
+        if (likely(jm->parentmgr || getpid() != 1)) {
                 return;
         }
@@ -4414 +4408 @@
                 const char *n = kp[i].kp_proc.p_comm;
 
-                if (p_i == 0 || p_i == 1) {
+                if (unlikely(p_i == 0 || p_i == 1)) {
                         kp_skipped++;
                         continue;
@@ -4463 +4457 @@
         launchd_assert(offsetof(struct jobmgr_s, kqjobmgr_callback) == 0);
 
-        if (jm && requestorport == MACH_PORT_NULL) {
+        if (unlikely(jm && requestorport == MACH_PORT_NULL)) {
                 jobmgr_log(jm, LOG_ERR, "Mach sub-bootstrap create request requires a requester port");
                 return NULL;
@@ -4610 +4604 @@
         if (jm == root_jobmgr) {
                 if (port == inherited_bootstrap_port) {
-                        launchd_assumes(launchd_mport_deallocate(port) == KERN_SUCCESS);
+                        jobmgr_assumes(jm, launchd_mport_deallocate(port) == KERN_SUCCESS);
                         inherited_bootstrap_port = MACH_PORT_NULL;
 
@@ -4639 +4633 @@
 {
         struct machservice *ms;
+        job_t target_j;
 
         if (target_pid) {
-                jobmgr_assumes(jm, !check_parent);
-        }
-
-        LIST_FOREACH(ms, &jm->ms_hash[hash_ms(name)], name_hash_sle) {
-                if ((target_pid && ms->per_pid && ms->job->p == target_pid) || (!target_pid && !ms->per_pid)) {
-                        if (strcmp(name, ms->name) == 0) {
+                //jobmgr_assumes(jm, !check_parent);
+
+                if (unlikely((target_j = jobmgr_find_by_pid(jm, target_pid, false)) == NULL)) {
+                        return NULL;
+                }
+
+                SLIST_FOREACH(ms, &target_j->machservices, sle) {
+                        if (ms->per_pid && strcmp(name, ms->name) == 0) {
                                 return ms;
                         }
                 }
-        }
-
-        if (jm->parentmgr == NULL) {
+
                 return NULL;
         }
 
-        if (!check_parent) {
+        LIST_FOREACH(ms, &jm->ms_hash[hash_ms(name)], name_hash_sle) {
+                if (!ms->per_pid && strcmp(name, ms->name) == 0) {
+                        return ms;
+                }
+        }
+
+        if (jm->parentmgr == NULL || !check_parent) {
                 return NULL;
         }
@@ -4696 +4697 @@
 machservice_delete(job_t j, struct machservice *ms, bool port_died)
 {
-        if (ms->debug_on_close) {
+        if (unlikely(ms->debug_on_close)) {
                 job_log(j, LOG_NOTICE, "About to enter kernel debugger because of Mach port: 0x%x", ms->port);
                 job_assumes(j, host_reboot(mach_host_self(), HOST_REBOOT_DEBUGGER) == KERN_SUCCESS);
@@ -4707 +4708 @@
         job_assumes(j, launchd_mport_deallocate(ms->port) == KERN_SUCCESS);
 
-        if (ms->port == the_exception_server) {
+        if (unlikely(ms->port == the_exception_server)) {
                 the_exception_server = 0;
         }
@@ -5277 +5278 @@
 #ifdef LET_MERE_MORTALS_ADD_SERVERS_TO_PID1
         if (getpid() == 1) {
-                if (ldc.euid && server_uid && (ldc.euid != server_uid)) {
+                if (unlikely(ldc.euid && server_uid && (ldc.euid != server_uid))) {
                         job_log(j, LOG_WARNING, "Server create: \"%s\": Will run as UID %d, not UID %d as they told us to",
                                         server_cmd, ldc.euid, server_uid);
@@ -5285 +5286 @@
 #endif
         if (getuid()) {
-                if (server_uid != getuid()) {
+                if (unlikely(server_uid != getuid())) {
                         job_log(j, LOG_WARNING, "Server create: \"%s\": As UID %d, we will not be able to switch to UID %d",
                                         server_cmd, getuid(), server_uid);