<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre, #msg p { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[23618] trunk/launchd/src/launchd_core_logic.c</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.macosforge.org/projects/launchd/changeset/23618">23618</a></dd>
<dt>Author</dt> <dd>zarzycki@apple.com</dd>
<dt>Date</dt> <dd>2008-05-02 16:19:24 -0700 (Fri, 02 May 2008)</dd>
</dl>
<h3>Log Message</h3>
<pre><rdar://problem/5875034> 10A52: Stuck at an empty desktop after changing homedirs
<rdar://problem/5871441> Investigation: Accounting for transient processes</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunklaunchdsrclaunchd_core_logicc">trunk/launchd/src/launchd_core_logic.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunklaunchdsrclaunchd_core_logicc"></a>
<div class="modfile"><h4>Modified: trunk/launchd/src/launchd_core_logic.c (23617 => 23618)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/launchd/src/launchd_core_logic.c 2008-05-02 22:58:06 UTC (rev 23617)
+++ trunk/launchd/src/launchd_core_logic.c 2008-05-02 23:19:24 UTC (rev 23618)
</span><span class="lines">@@ -324,8 +324,6 @@
</span><span class="cx"> /* static void jobmgr_log_error(jobmgr_t jm, int pri, const char *msg, ...) __attribute__((format(printf, 3, 4))); */
</span><span class="cx"> static void jobmgr_log_bug(jobmgr_t jm, unsigned int line);
</span><span class="cx">
</span><del>-#define DO_RUSAGE_SUMMATION 0
-
</del><span class="cx"> #define AUTO_PICK_LEGACY_LABEL (const char *)(~0)
</span><span class="cx">
</span><span class="cx"> struct job_s {
</span><span class="lines">@@ -343,9 +341,7 @@
</span><span class="cx"> SLIST_HEAD(, machservice) machservices;
</span><span class="cx"> SLIST_HEAD(, semaphoreitem) semaphores;
</span><span class="cx"> SLIST_HEAD(, waiting_for_removal) removal_watchers;
</span><del>-#if DO_RUSAGE_SUMMATION
</del><span class="cx"> struct rusage ru;
</span><del>-#endif
</del><span class="cx"> cpu_type_t *j_binpref;
</span><span class="cx"> size_t j_binpref_cnt;
</span><span class="cx"> mach_port_t j_port;
</span><span class="lines">@@ -921,7 +917,6 @@
</span><span class="cx">
</span><span class="cx"> ipc_close_all_with_job(j);
</span><span class="cx">
</span><del>-#if DO_RUSAGE_SUMMATION
</del><span class="cx"> 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",
</span><span class="cx"> j->ru.ru_utime.tv_sec, j->ru.ru_utime.tv_usec,
</span><span class="cx"> j->ru.ru_stime.tv_sec, j->ru.ru_stime.tv_usec,
</span><span class="lines">@@ -930,7 +925,6 @@
</span><span class="cx"> j->ru.ru_nswap, j->ru.ru_inblock, j->ru.ru_oublock,
</span><span class="cx"> j->ru.ru_msgsnd, j->ru.ru_msgrcv,
</span><span class="cx"> j->ru.ru_nsignals, j->ru.ru_nvcsw, j->ru.ru_nivcsw);
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> if (j->forced_peers_to_demand_mode) {
</span><span class="cx"> job_set_global_on_demand(j, false);
</span><span class="lines">@@ -2393,7 +2387,6 @@
</span><span class="cx"> job_log(j, LOG_INFO, "Exited %lld.%06lld seconds after %s was sent", td_sec, td_usec, signal_to_C_name(SIGTERM));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if DO_RUSAGE_SUMMATION
</del><span class="cx"> timeradd(&ru.ru_utime, &j->ru.ru_utime, &j->ru.ru_utime);
</span><span class="cx"> timeradd(&ru.ru_stime, &j->ru.ru_stime, &j->ru.ru_stime);
</span><span class="cx"> j->ru.ru_maxrss += ru.ru_maxrss;
</span><span class="lines">@@ -2410,7 +2403,6 @@
</span><span class="cx"> j->ru.ru_nsignals += ru.ru_nsignals;
</span><span class="cx"> j->ru.ru_nvcsw += ru.ru_nvcsw;
</span><span class="cx"> j->ru.ru_nivcsw += ru.ru_nivcsw;
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> if (WIFEXITED(status) && WEXITSTATUS(status) != 0) {
</span><span class="cx"> job_log(j, LOG_WARNING, "Exited with exit code: %d", WEXITSTATUS(status));
</span><span class="lines">@@ -3171,7 +3163,6 @@
</span><span class="cx"> {
</span><span class="cx"> /* This function is all about 5201578 */
</span><span class="cx">
</span><del>- const char *shell_env_var = getenv("SHELL");
</del><span class="cx"> const char *home_env_var = getenv("HOME");
</span><span class="cx"> const char *user_env_var = getenv("USER");
</span><span class="cx"> const char *logname_env_var = getenv("LOGNAME");
</span><span class="lines">@@ -3183,7 +3174,7 @@
</span><span class="cx"> struct passwd *pwe;
</span><span class="cx">
</span><span class="cx">
</span><del>- if (!job_assumes(j, shell_env_var && home_env_var && user_env_var && logname_env_var
</del><ins>+ if (!job_assumes(j, home_env_var && user_env_var && logname_env_var
</ins><span class="cx"> && strcmp(user_env_var, logname_env_var) == 0)) {
</span><span class="cx"> goto out_bad;
</span><span class="cx"> }
</span><span class="lines">@@ -3208,10 +3199,6 @@
</span><span class="cx"> strlcpy(loginname, pwe->pw_name, sizeof(loginname));
</span><span class="cx"> strlcpy(homedir, pwe->pw_dir, sizeof(homedir));
</span><span class="cx">
</span><del>- 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;
- }
</del><span class="cx"> if (strcmp(loginname, logname_env_var) != 0) {
</span><span class="cx"> job_log(j, LOG_ERR, "The %s environmental variable changed out from under us!", "USER");
</span><span class="cx"> goto out_bad;
</span><span class="lines">@@ -3233,8 +3220,12 @@
</span><span class="cx">
</span><span class="cx"> return;
</span><span class="cx"> out_bad:
</span><ins>+#if 0
</ins><span class="cx"> job_assumes(j, runtime_kill(getppid(), SIGTERM) != -1);
</span><span class="cx"> _exit(EXIT_FAILURE);
</span><ins>+#else
+ job_log(j, LOG_WARNING, "In a future build of the OS, this error will be fatal.");
+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void
</span></span></pre>
</div>
</div>
</body>
</html>