Changeset 23618

Timestamp:

2008-05-02 16:19:24 (4 months ago)

Author:

zarzycki@…

Message:

<rdar://problem/5875034> 10A52: Stuck at an empty desktop after changing homedirs
<rdar://problem/5871441> Investigation: Accounting for transient processes

Files:

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

trunk/launchd/src/launchd_core_logic.c

@@ -325 +325 @@
 static void jobmgr_log_bug(jobmgr_t jm, unsigned int line);
 
-#define DO_RUSAGE_SUMMATION 0
-
 #define AUTO_PICK_LEGACY_LABEL (const char *)(~0)
 
@@ -344 +342 @@
         SLIST_HEAD(, semaphoreitem) semaphores;
         SLIST_HEAD(, waiting_for_removal) removal_watchers;
-#if DO_RUSAGE_SUMMATION
         struct rusage ru;
-#endif
         cpu_type_t *j_binpref;
         size_t j_binpref_cnt;
@@ -922 +918 @@
         ipc_close_all_with_job(j);
 
-#if DO_RUSAGE_SUMMATION
         job_log(j, LOG_INFO, "Total rusage: utime %ld.%06u stime %ld.%06u maxrss %lu ixrss %lu idrss %lu isrss %lu minflt %lu majflt %lu nswap %lu inblock %lu oublock %lu msgsnd %lu msgrcv %lu nsignals %lu nvcsw %lu nivcsw %lu",
                         j->ru.ru_utime.tv_sec, j->ru.ru_utime.tv_usec,
@@ -931 +926 @@
                         j->ru.ru_msgsnd, j->ru.ru_msgrcv,
                         j->ru.ru_nsignals, j->ru.ru_nvcsw, j->ru.ru_nivcsw);
-#endif
 
         if (j->forced_peers_to_demand_mode) {
@@ -2394 +2388 @@
         }
 
-#if DO_RUSAGE_SUMMATION
         timeradd(&ru.ru_utime, &j->ru.ru_utime, &j->ru.ru_utime);
         timeradd(&ru.ru_stime, &j->ru.ru_stime, &j->ru.ru_stime);
@@ -2411 +2404 @@
         j->ru.ru_nvcsw += ru.ru_nvcsw;
         j->ru.ru_nivcsw += ru.ru_nivcsw;
-#endif
 
         if (WIFEXITED(status) && WEXITSTATUS(status) != 0) {
@@ -3172 +3164 @@
         /* This function is all about 5201578 */
 
-        const char *shell_env_var = getenv("SHELL");
         const char *home_env_var = getenv("HOME");
         const char *user_env_var = getenv("USER");
@@ -3184 +3175 @@
 
 
-        if (!job_assumes(j, shell_env_var && home_env_var && user_env_var && logname_env_var
+        if (!job_assumes(j, home_env_var && user_env_var && logname_env_var
                                 && strcmp(user_env_var, logname_env_var) == 0)) {
                 goto out_bad;
@@ -3209 +3200 @@
         strlcpy(homedir, pwe->pw_dir, sizeof(homedir));
 
-        if (strcmp(shellpath, shell_env_var) != 0) {
-                job_log(j, LOG_ERR, "The %s environmental variable changed out from under us!", "SHELL");
-                goto out_bad;
-        }
         if (strcmp(loginname, logname_env_var) != 0) {
                 job_log(j, LOG_ERR, "The %s environmental variable changed out from under us!", "USER");
@@ -3234 +3221 @@
         return;
 out_bad:
+#if 0
         job_assumes(j, runtime_kill(getppid(), SIGTERM) != -1);
         _exit(EXIT_FAILURE);
+#else
+        job_log(j, LOG_WARNING, "In a future build of the OS, this error will be fatal.");
+#endif
 }