Changeset 23481

Timestamp:

01/11/08 09:12:59 (11 months ago)

Author:

zarzycki@…

Message:

Most of the time, when launchd calls getpid(), it simply wants to know whether it should do "PID 1 magic." This simplifies the code a bit.

Location:

trunk/launchd/src

Files:

• launchd.c (modified) (3 diffs)
• launchd_core_logic.c (modified) (22 diffs)
• launchd_runtime.c (modified) (4 diffs)
• launchd_runtime.h (modified) (1 diff)
• launchd_unix_ipc.c (modified) (2 diffs)

trunk/launchd/src/launchd.c

@@ -135 +135 @@
         }
 
-        if (getpid() == 1) {
+        if (pid1_magic) {
                 pid1_magic_init();
         } else {
@@ -143 +143 @@
         monitor_networking_state();
 
-        if (getpid() == 1) {
+        if (pid1_magic) {
                 handle_pid1_crashes_separately();
         }
@@ -254 +254 @@
         shutdown_in_progress = true;
 
-        if (getpid() == 1) {
+        if (pid1_magic) {
                 /*
                  * When this changes to a more sustainable API, update this:

trunk/launchd/src/launchd_core_logic.c

@@ -715 +715 @@
         }
 
-        if (do_apple_internal_logging() && jm->parentmgr == NULL && getpid() == 1) {
+        if (do_apple_internal_logging() && jm->parentmgr == NULL && pid1_magic) {
                 runtime_set_timeout(still_alive_with_check, 5);
         }
@@ -757 +757 @@
                 runtime_del_ref();
                 SLIST_REMOVE(&jm->parentmgr->submgrs, jm, jobmgr_s, sle);
-        } else if (getpid() == 1) {
+        } else if (pid1_magic) {
                 jobmgr_log(jm, LOG_DEBUG, "About to call: sync()");
                 sync(); /* We're are going to rely on log timestamps to benchmark this call */
@@ -1121 +1121 @@
                 break;
         case 1:
-                if (getpid() != 1) {
+                if (!pid1_magic) {
                         /* we cannot possibly find a parent job_t that is useful in this function */
                         break;
@@ -2525 +2525 @@
                         runtime_closelog(); /* HACK -- force 'start' time to be set */
 
-                        if (getpid() == 1) {
+                        if (pid1_magic) {
                                 int64_t now = runtime_get_wall_time();
 
@@ -4205 +4205 @@
                 job_assumes(j, task_set_exception_ports(target_task, EXC_MASK_CRASH, exc_port,
                                         EXCEPTION_STATE_IDENTITY | MACH_EXCEPTION_CODES, f) == KERN_SUCCESS);
-        } else if (getpid() == 1 && the_exception_server) {
+        } else if (pid1_magic && the_exception_server) {
                 mach_port_t mhp = mach_host_self();
                 job_assumes(j, host_set_exception_ports(mhp, EXC_MASK_CRASH, the_exception_server,
@@ -4255 +4255 @@
                                 break;
                         }
-                } else if (strcasecmp(key, LAUNCH_JOBKEY_MACH_HOSTSPECIALPORT) == 0 && getpid() == 1) {
+                } else if (strcasecmp(key, LAUNCH_JOBKEY_MACH_HOSTSPECIALPORT) == 0 && pid1_magic) {
                         if (which_port > HOST_MAX_SPECIAL_KERNEL_PORT) {
                                 job_assumes(ms->job, (errno = host_set_special_port(mhp, which_port, ms->port)) == KERN_SUCCESS);
@@ -4388 +4388 @@
         struct kinfo_proc *kp;
 
-        if (likely(jm->parentmgr || getpid() != 1)) {
+        if (likely(jm->parentmgr || !pid1_magic)) {
                 return;
         }
@@ -4484 +4484 @@
                 jobmgr_assumes(jmr, jm != NULL);
                 jmr->jm_port = transfer_port;
-        } else if (!jm && getpid() != 1) {
+        } else if (!jm && !pid1_magic) {
                 char *trusted_fd = getenv(LAUNCHD_TRUSTED_FD_ENV);
                 name_t service_buf;
@@ -5277 +5277 @@
         /* XXX - This code should go away once the per session launchd is integrated with the rest of the system */
 #ifdef LET_MERE_MORTALS_ADD_SERVERS_TO_PID1
-        if (getpid() == 1) {
+        if (pid1_magic) {
                 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",
@@ -5663 +5663 @@
         }
 
-        if (unlikely(getpid() != 1)) {
+        if (unlikely(!pid1_magic)) {
                 return BOOTSTRAP_NOT_PRIVILEGED;
         }
@@ -5732 +5732 @@
 ensure_root_bkgd_setup(void)
 {
-        if (likely(background_jobmgr) || getpid() != 1) {
+        if (likely(background_jobmgr) || !pid1_magic) {
                 return;
         }
@@ -5758 +5758 @@
         runtime_get_caller_creds(&ldc);
 
-        if (unlikely(getpid() != 1)) {
+        if (unlikely(!pid1_magic)) {
                 job_log(j, LOG_ERR, "Only PID 1 supports per user launchd lookups.");
                 return BOOTSTRAP_NOT_PRIVILEGED;
@@ -5897 +5897 @@
          */
         if (unlikely(j->anonymous && job_get_bs(j)->parentmgr == NULL && ldc.uid != 0 && ldc.uid != getuid() && ldc.uid != 92)) {
-                if (getpid() == 1) {
+                if (pid1_magic) {
                         return VPROC_ERR_TRY_PER_USER;
                 } else {
@@ -5942 +5942 @@
         runtime_get_caller_creds(&ldc);
 
-        if (unlikely(getpid() == 1 && j->anonymous && job_get_bs(j)->parentmgr == NULL && ldc.uid != 0 && ldc.euid != 0)) {
+        if (unlikely(pid1_magic && j->anonymous && job_get_bs(j)->parentmgr == NULL && ldc.uid != 0 && ldc.euid != 0)) {
                 return VPROC_ERR_TRY_PER_USER;
         }
@@ -5982 +5982 @@
                 /* The previous routine moved the reply port, we're forced to return MIG_NO_REPLY now */
                 return MIG_NO_REPLY;
-        } else if (getpid() == 1 && j->anonymous && ldc.euid >= 500 && strcasecmp(job_get_bs(j)->name, VPROCMGR_SESSION_LOGINWINDOW) == 0) {
+        } else if (pid1_magic && j->anonymous && ldc.euid >= 500 && strcasecmp(job_get_bs(j)->name, VPROCMGR_SESSION_LOGINWINDOW) == 0) {
                 /*
                  * 5240036 Should start background session when a lookup of CCacheServer occurs
@@ -6114 +6114 @@
                 } else if (strcasecmp(jmi->name, where) == 0) {
                         goto jm_found;
-                } else if (strcasecmp(jmi->name, VPROCMGR_SESSION_BACKGROUND) == 0 && getpid() == 1) {
+                } else if (strcasecmp(jmi->name, VPROCMGR_SESSION_BACKGROUND) == 0 && pid1_magic) {
                         SLIST_FOREACH(jmi2, &jmi->submgrs, sle) {
                                 if (strcasecmp(jmi2->name, where) == 0) {
@@ -6163 +6163 @@
 
                 if (j->mgr->session_initialized) {
-                        if (ldc.uid == 0 && getpid() == 1) {
+                        if (ldc.uid == 0 && pid1_magic) {
                                 if (strcmp(j->mgr->name, VPROCMGR_SESSION_LOGINWINDOW) == 0) {
                                         job_t ji, jn;
@@ -6201 +6201 @@
                                 goto out;
                         }
-                } else if (ldc.uid == 0 && getpid() == 1 && strcmp(session_type, VPROCMGR_SESSION_STANDARDIO) == 0) {
+                } else if (ldc.uid == 0 && pid1_magic && strcmp(session_type, VPROCMGR_SESSION_STANDARDIO) == 0) {
                         ensure_root_bkgd_setup();
 
@@ -6335 +6335 @@
         jm = j->mgr;
 
-        if (unlikely(getpid() != 1)) {
+        if (unlikely(!pid1_magic)) {
                 job_log(j, LOG_ERR, "Only the system launchd will transfer Mach sub-bootstraps.");
                 return BOOTSTRAP_NOT_PRIVILEGED;
@@ -6607 +6607 @@
         }
 
-        if (unlikely(getpid() == 1 && ldc.euid && ldc.uid)) {
+        if (unlikely(pid1_magic && ldc.euid && ldc.uid)) {
                 job_log(j, LOG_DEBUG, "Punting spawn to per-user-context");
                 return VPROC_ERR_TRY_PER_USER;
@@ -6633 +6633 @@
         job_reparent_hack(jr, NULL);
 
-        if (getpid() == 1) {
+        if (pid1_magic) {
                 jr->mach_uid = ldc.uid;
         }
@@ -6671 +6671 @@
 jobmgr_init(bool sflag)
 {
-        const char *root_session_type = getpid() == 1 ? VPROCMGR_SESSION_SYSTEM : VPROCMGR_SESSION_BACKGROUND;
+        const char *root_session_type = pid1_magic ? VPROCMGR_SESSION_SYSTEM : VPROCMGR_SESSION_BACKGROUND;
 
         launchd_assert((root_jobmgr = jobmgr_new(NULL, MACH_PORT_NULL, MACH_PORT_NULL, sflag, root_session_type)) != NULL);

trunk/launchd/src/launchd_runtime.c

@@ -121 +121 @@
 static sigset_t sigign_set;
 static FILE *ourlogfile;
-
+bool pid1_magic;
 
 INTERNAL_ABI mach_port_t
@@ -1159 +1159 @@
         struct runtime_syslog_attr attr = {
                 "com.apple.launchd", "com.apple.launchd",
-                getpid() == 1 ? "System" : "Background",
+                pid1_magic ? "System" : "Background",
                 pri, getuid(), getpid(), getpid()
         };
@@ -1327 +1327 @@
                 launchd_assumes(STAILQ_EMPTY(&logmsg_queue));
                 return;
-        } else if (getpid() != 1) {
+        } else if (!pid1_magic) {
                 if (runtime_log_pack(&outval, &outvalCnt) == 0) {
                         launchd_assumes(_vprocmgr_log_forward(inherited_bootstrap_port, (void *)outval, outvalCnt) == NULL);
@@ -1606 +1606 @@
         tbi_float_val = tbi.numer;
         tbi_float_val /= tbi.denom;
-}
+
+        if (getpid() == 1) {
+                pid1_magic = true;
+        }
+}

trunk/launchd/src/launchd_runtime.h

@@ -104 +104 @@
 typedef INTERNAL_ABI void (*timeout_callback)(void);
 
+extern bool pid1_magic;
+
 INTERNAL_ABI mach_port_t runtime_get_kernel_port(void);
 

trunk/launchd/src/launchd_unix_ipc.c

@@ -103 +103 @@
         sun.sun_family = AF_UNIX;
 
-        if (getpid() == 1) {
+        if (pid1_magic) {
                 strcpy(ourdir, LAUNCHD_SOCK_PREFIX);
                 strncpy(sun.sun_path, LAUNCHD_SOCK_PREFIX "/sock", sizeof(sun.sun_path));
@@ -459 +459 @@
                         }
 
-                        if (/* XXX readcfg_pid && */ getpid() == 1 && (i == RLIMIT_NOFILE || i == RLIMIT_NPROC)) {
+                        if (/* XXX readcfg_pid && */ pid1_magic && (i == RLIMIT_NOFILE || i == RLIMIT_NPROC)) {
                                 int gmib[] = { CTL_KERN, KERN_MAXPROC };
                                 int pmib[] = { CTL_KERN, KERN_MAXPROCPERUID };