August 2007 - launchd-changes - lists.macosforge.org

[23349] tags/launchd-240/
by source_changes＠macosforge.org 24 Aug '07

24 Aug '07

Revision: 23349 http://trac.macosforge.org/projects/launchd/changeset/23349 Author: zarzycki(a)apple.com Date: 2007-08-24 15:17:58 -0700 (Fri, 24 Aug 2007) Log Message: ----------- "Tagging launchd-240 from https://svn.macosforge.org/repository/launchd/trunk" Added Paths: ----------- tags/launchd-240/ Copied: tags/launchd-240 (from rev 23348, trunk)

1 0

[23348] trunk/launchd/src/launchctl.c
by source_changes＠macosforge.org 24 Aug '07

24 Aug '07

Revision: 23348 http://trac.macosforge.org/projects/launchd/changeset/23348 Author: zarzycki(a)apple.com Date: 2007-08-24 15:17:47 -0700 (Fri, 24 Aug 2007) Log Message: ----------- <rdar://problem/5426036> launchd should not create an empty utmp anymore Modified Paths: -------------- trunk/launchd/src/launchctl.c Modified: trunk/launchd/src/launchctl.c =================================================================== --- trunk/launchd/src/launchctl.c 2007-08-24 21:36:11 UTC (rev 23347) +++ trunk/launchd/src/launchctl.c 2007-08-24 22:17:47 UTC (rev 23348) @@ -1446,9 +1446,6 @@ assumes(fwexec(dirhelper_tool, true) != -1); } - // 775 root:daemon /var/run/StartupItems - - assumes(touch_file(_PATH_UTMP, DEFFILEMODE) != -1); assumes(touch_file(_PATH_UTMPX, DEFFILEMODE) != -1); assumes(touch_file(_PATH_VARRUN "/.systemStarterRunning", DEFFILEMODE) != -1);

1 0

[23347] trunk/launchd/src/launchd_core_logic.c
by source_changes＠macosforge.org 24 Aug '07

24 Aug '07

Revision: 23347 http://trac.macosforge.org/projects/launchd/changeset/23347 Author: zarzycki(a)apple.com Date: 2007-08-24 14:36:11 -0700 (Fri, 24 Aug 2007) Log Message: ----------- Typo. Modified Paths: -------------- trunk/launchd/src/launchd_core_logic.c Modified: trunk/launchd/src/launchd_core_logic.c =================================================================== --- trunk/launchd/src/launchd_core_logic.c 2007-08-24 21:31:24 UTC (rev 23346) +++ trunk/launchd/src/launchd_core_logic.c 2007-08-24 21:36:11 UTC (rev 23347) @@ -5719,7 +5719,7 @@ * * We're working around LoginWindow and the WindowServer. * - * In practice, there is only one LoginWindow session. * Unfortunately, for certain + * In practice, there is only one LoginWindow session. Unfortunately, for certain * scenarios, the WindowServer spawns loginwindow, and in those cases, it frequently * spawns a replacement loginwindow session before cleaning up the previous one. *

1 0

[23346] trunk/launchd/src/launchd_core_logic.c
by source_changes＠macosforge.org 24 Aug '07

24 Aug '07

Revision: 23346 http://trac.macosforge.org/projects/launchd/changeset/23346 Author: zarzycki(a)apple.com Date: 2007-08-24 14:31:24 -0700 (Fri, 24 Aug 2007) Log Message: ----------- <rdar://problem/5330262> Cancelled FUS restart kills pre-login launchd agent Modified Paths: -------------- trunk/launchd/src/launchd_core_logic.c Modified: trunk/launchd/src/launchd_core_logic.c =================================================================== --- trunk/launchd/src/launchd_core_logic.c 2007-08-17 20:48:49 UTC (rev 23345) +++ trunk/launchd/src/launchd_core_logic.c 2007-08-24 21:31:24 UTC (rev 23346) @@ -5614,7 +5614,9 @@ } SLIST_FOREACH(jmi, &root_jobmgr->submgrs, sle) { - if (strcasecmp(jmi->name, where) == 0) { + if (jmi->shutting_down) { + continue; + } else if (strcasecmp(jmi->name, where) == 0) { goto jm_found; } else if (strcasecmp(jmi->name, VPROCMGR_SESSION_BACKGROUND) == 0 && getpid() == 1) { SLIST_FOREACH(jmi2, &jmi->submgrs, sle) { @@ -5709,6 +5711,31 @@ SLIST_REMOVE(&j->mgr->parentmgr->submgrs, j->mgr, jobmgr_s, sle); j->mgr->parentmgr = background_jobmgr; SLIST_INSERT_HEAD(&j->mgr->parentmgr->submgrs, j->mgr, sle); + } else if (strcmp(session_type, VPROCMGR_SESSION_LOGINWINDOW) == 0) { + jobmgr_t jmi; + + /* + * 5330262 + * + * We're working around LoginWindow and the WindowServer. + * + * In practice, there is only one LoginWindow session. * Unfortunately, for certain + * scenarios, the WindowServer spawns loginwindow, and in those cases, it frequently + * spawns a replacement loginwindow session before cleaning up the previous one. + * + * We're going to use the creation of a new LoginWindow context as a clue that the + * previous LoginWindow context is on the way out and therefore we should just + * kick-start the shutdown of it. + */ + + SLIST_FOREACH(jmi, &root_jobmgr->submgrs, sle) { + if (jmi->shutting_down) { + continue; + } else if (strcasecmp(jmi->name, session_type) == 0) { + jobmgr_shutdown(jmi); + break; + } + } } jobmgr_log(j->mgr, LOG_DEBUG, "Renaming to: %s", session_type);

1 0

[23345] tags/launchd-239/
by source_changes＠macosforge.org 17 Aug '07

17 Aug '07

Revision: 23345 http://trac.macosforge.org/projects/launchd/changeset/23345 Author: zarzycki(a)apple.com Date: 2007-08-17 13:48:49 -0700 (Fri, 17 Aug 2007) Log Message: ----------- "Tagging launchd-239 from https://svn.macosforge.org/repository/launchd/trunk" Added Paths: ----------- tags/launchd-239/ Copied: tags/launchd-239 (from rev 23344, trunk)

1 0

[23344] trunk/launchd/src/launchd_runtime.c
by source_changes＠macosforge.org 17 Aug '07

17 Aug '07

Revision: 23344 http://trac.macosforge.org/projects/launchd/changeset/23344 Author: zarzycki(a)apple.com Date: 2007-08-17 12:48:42 -0700 (Fri, 17 Aug 2007) Log Message: ----------- Adjust some log levels for GM. Modified Paths: -------------- trunk/launchd/src/launchd_runtime.c Modified: trunk/launchd/src/launchd_runtime.c =================================================================== --- trunk/launchd/src/launchd_runtime.c 2007-08-17 19:34:42 UTC (rev 23343) +++ trunk/launchd/src/launchd_runtime.c 2007-08-17 19:48:42 UTC (rev 23344) @@ -725,8 +725,9 @@ } if (launchd_assumes(kev.flags & EV_ERROR)) { - if ((flags & EV_ADD) && !launchd_assumes(kev.data == 0)) { - log_kevent_struct(LOG_ERR, &kev, 0); + if ((flags & EV_ADD) && kev.data) { + runtime_syslog(LOG_DEBUG, "%s(): See the next line...", __func__); + log_kevent_struct(LOG_DEBUG, &kev, 0); errno = kev.data; return -1; }

1 0

[23343] trunk/launchd/src
by source_changes＠macosforge.org 17 Aug '07

17 Aug '07

Revision: 23343 http://trac.macosforge.org/projects/launchd/changeset/23343 Author: zarzycki(a)apple.com Date: 2007-08-17 12:34:42 -0700 (Fri, 17 Aug 2007) Log Message: ----------- We need to make logging synchronous for now. Modified Paths: -------------- trunk/launchd/src/launchd_core_logic.c trunk/launchd/src/protocol_job.defs Modified: trunk/launchd/src/launchd_core_logic.c =================================================================== --- trunk/launchd/src/launchd_core_logic.c 2007-08-17 13:57:22 UTC (rev 23342) +++ trunk/launchd/src/launchd_core_logic.c 2007-08-17 19:34:42 UTC (rev 23343) @@ -995,6 +995,10 @@ return NULL; } + if (!jobmgr_assumes(jm, len == sizeof(kp))) { + return NULL; + } + if (!jobmgr_assumes(jm, kp.kp_proc.p_comm[0] != '\0')) { return NULL; } Modified: trunk/launchd/src/protocol_job.defs =================================================================== --- trunk/launchd/src/protocol_job.defs 2007-08-17 13:57:22 UTC (rev 23342) +++ trunk/launchd/src/protocol_job.defs 2007-08-17 19:34:42 UTC (rev 23343) @@ -135,7 +135,7 @@ __flags : uint64_t; __service : name_t); -simpleroutine log( +routine log( __bs_port : job_t; __pri : integer_t; __err : integer_t;

1 0

[23342] tags/launchd-238/
by source_changes＠macosforge.org 17 Aug '07

17 Aug '07

Revision: 23342 http://trac.macosforge.org/projects/launchd/changeset/23342 Author: zarzycki(a)apple.com Date: 2007-08-17 06:57:22 -0700 (Fri, 17 Aug 2007) Log Message: ----------- "Tagging launchd-238 from https://svn.macosforge.org/repository/launchd/trunk" Added Paths: ----------- tags/launchd-238/ Copied: tags/launchd-238 (from rev 23341, trunk)

1 0

[23341] trunk/launchd/src/StartupItems.c
by source_changes＠macosforge.org 17 Aug '07

17 Aug '07

Revision: 23341 http://trac.macosforge.org/projects/launchd/changeset/23341 Author: zarzycki(a)apple.com Date: 2007-08-17 06:57:05 -0700 (Fri, 17 Aug 2007) Log Message: ----------- <rdar://problem/5416262> StartupItem requiring "NIS" does not run Modified Paths: -------------- trunk/launchd/src/StartupItems.c Modified: trunk/launchd/src/StartupItems.c =================================================================== --- trunk/launchd/src/StartupItems.c 2007-08-16 22:07:50 UTC (rev 23340) +++ trunk/launchd/src/StartupItems.c 2007-08-17 13:57:05 UTC (rev 23341) @@ -159,6 +159,7 @@ CFSTR("Network"), CFSTR("TIM"), CFSTR("Disks"), + CFSTR("NIS"), NULL }; CFMutableArrayRef aList, aNewList;

1 0

[23340] trunk/launchd/src/launchd_core_logic.c
by source_changes＠macosforge.org 16 Aug '07

16 Aug '07

Revision: 23340 http://trac.macosforge.org/projects/launchd/changeset/23340 Author: zarzycki(a)apple.com Date: 2007-08-16 15:07:50 -0700 (Thu, 16 Aug 2007) Log Message: ----------- <rdar://problem/5415523> Server9A525(Install): Server doesn't bring Server Assistant after installation completed. Modified Paths: -------------- trunk/launchd/src/launchd_core_logic.c Modified: trunk/launchd/src/launchd_core_logic.c =================================================================== --- trunk/launchd/src/launchd_core_logic.c 2007-08-14 21:14:14 UTC (rev 23339) +++ trunk/launchd/src/launchd_core_logic.c 2007-08-16 22:07:50 UTC (rev 23340) @@ -3035,6 +3035,7 @@ semaphoreitem_watch(job_t j, struct semaphoreitem *si) { char parentdir_path[PATH_MAX], *which_path = si->what; + int saved_errno = 0; int fflags = 0; strlcpy(parentdir_path, dirname(si->what), sizeof(parentdir_path)); @@ -3054,6 +3055,7 @@ return; } + /* See 5321044 for why we do the do-while loop and 5415523 for why ENOENT is checked */ do { if (si->fd == -1) { if ((si->fd = _fd(open(which_path, O_EVTONLY|O_NOCTTY))) == -1) { @@ -3069,6 +3071,7 @@ job_log(j, LOG_DEBUG, "Watching Vnode: %d", si->fd); if (kevent_mod(si->fd, EVFILT_VNODE, EV_ADD, fflags, 0, j) == -1) { + saved_errno = errno; /* * The FD can be revoked between the open() and kevent(). * This is similar to the inability for kevents to be @@ -3078,7 +3081,7 @@ job_assumes(j, runtime_close(si->fd) == 0); si->fd = -1; } - } while (si->fd == -1); + } while ((si->fd == -1) && (saved_errno == ENOENT)); } void

1 0