April 2008 - launchd-changes - lists.macosforge.org

[23614] branches/SULeopard/launchd/src/launchctl.c
by source_changes＠macosforge.org 30 Apr '08

30 Apr '08

Revision: 23614 http://trac.macosforge.org/projects/launchd/changeset/23614 Author: zarzycki(a)apple.com Date: 2008-04-30 14:32:53 -0700 (Wed, 30 Apr 2008) Log Message: ----------- <rdar://problem/5865623> Boot fail count doesn't increase with unclean-boot issue Modified Paths: -------------- branches/SULeopard/launchd/src/launchctl.c Modified: branches/SULeopard/launchd/src/launchctl.c =================================================================== --- branches/SULeopard/launchd/src/launchctl.c 2008-04-30 21:14:41 UTC (rev 23613) +++ branches/SULeopard/launchd/src/launchctl.c 2008-04-30 21:32:53 UTC (rev 23614) @@ -2805,7 +2805,10 @@ #if TARGET_OS_EMBEDDED if (path_check("/etc/fstab")) { const char *mount_tool[] = { "mount", "-vat", "nonfs", NULL }; - assumes(fwexec(mount_tool, true) != -1); + if (!assumes(fwexec(mount_tool, true) != -1)) { + assumes(fwexec(nvram_tool, true) != -1); + assumes(reboot(RB_AUTOBOOT) != -1); + } } else #endif {

1 0

[23613] branches/SULeopard/launchd/src/launchd_core_logic.c
by source_changes＠macosforge.org 30 Apr '08

30 Apr '08

Revision: 23613 http://trac.macosforge.org/projects/launchd/changeset/23613 Author: zarzycki(a)apple.com Date: 2008-04-30 14:14:41 -0700 (Wed, 30 Apr 2008) Log Message: ----------- Backport a think-o. Modified Paths: -------------- branches/SULeopard/launchd/src/launchd_core_logic.c Modified: branches/SULeopard/launchd/src/launchd_core_logic.c =================================================================== --- branches/SULeopard/launchd/src/launchd_core_logic.c 2008-04-30 20:32:54 UTC (rev 23612) +++ branches/SULeopard/launchd/src/launchd_core_logic.c 2008-04-30 21:14:41 UTC (rev 23613) @@ -2259,6 +2259,8 @@ } j->last_exit_status = status; j->sent_sigkill = false; + j->lastlookup = NULL; + j->lastlookup_gennum = 0; j->p = 0; /*

1 0

[23612] tags/launchd-273/
by source_changes＠macosforge.org 30 Apr '08

30 Apr '08

Revision: 23612 http://trac.macosforge.org/projects/launchd/changeset/23612 Author: zarzycki(a)apple.com Date: 2008-04-30 13:32:54 -0700 (Wed, 30 Apr 2008) Log Message: ----------- "Tagging launchd-273 from https://svn.macosforge.org/repository/launchd/trunk" Added Paths: ----------- tags/launchd-273/ Copied: tags/launchd-273 (from rev 23611, trunk)

1 0

[23611] trunk/launchd/src/libbootstrap.c
by source_changes＠macosforge.org 30 Apr '08

30 Apr '08

Revision: 23611 http://trac.macosforge.org/projects/launchd/changeset/23611 Author: zarzycki(a)apple.com Date: 2008-04-30 13:31:20 -0700 (Wed, 30 Apr 2008) Log Message: ----------- <rdar://problem/5737942> WindowServer is hammering my console with "Please fix the framework to cache the Mach port" messages Modified Paths: -------------- trunk/launchd/src/libbootstrap.c Modified: trunk/launchd/src/libbootstrap.c =================================================================== --- trunk/launchd/src/libbootstrap.c 2008-04-30 17:29:52 UTC (rev 23610) +++ trunk/launchd/src/libbootstrap.c 2008-04-30 20:31:20 UTC (rev 23611) @@ -169,20 +169,47 @@ kern_return_t bootstrap_look_up2(mach_port_t bp, name_t service_name, mach_port_t *sp, pid_t target_pid, uint64_t flags) { - kern_return_t kr; + static pthread_mutex_t bslu2_lock = PTHREAD_MUTEX_INITIALIZER; + static mach_port_t prev_bp; + static mach_port_t prev_sp; + static name_t prev_name; + kern_return_t kr = 0; mach_port_t puc; + pthread_mutex_lock(&bslu2_lock); + + if (prev_sp) { + if ((bp == prev_bp) && (strncmp(prev_name, service_name, sizeof(name_t)) == 0) + && (mach_port_mod_refs(mach_task_self(), prev_sp, MACH_PORT_RIGHT_SEND, 1) == 0)) { + *sp = prev_sp; + goto out; + } else { + mach_port_deallocate(mach_task_self(), prev_sp); + prev_sp = 0; + } + } + if ((kr = vproc_mig_look_up2(bp, service_name, sp, target_pid, flags)) != VPROC_ERR_TRY_PER_USER) { - return kr; + goto out; } if ((kr = vproc_mig_lookup_per_user_context(bp, 0, &puc)) != 0) { - return kr; + goto out; } kr = vproc_mig_look_up2(puc, service_name, sp, target_pid, flags); mach_port_deallocate(mach_task_self(), puc); +out: + if (kr == 0 && prev_sp == 0 && mach_port_mod_refs(mach_task_self(), *sp, MACH_PORT_RIGHT_SEND, 1) == 0) { + /* We're going to hold on to a send right as a MRU cache */ + prev_bp = bp; + prev_sp = *sp; + strlcpy(prev_name, service_name, sizeof(name_t)); + } + + pthread_mutex_unlock(&bslu2_lock); + return kr; }

1 0

[23610] trunk/launchd/src/launchd_core_logic.c
by source_changes＠macosforge.org 30 Apr '08

30 Apr '08

Revision: 23610 http://trac.macosforge.org/projects/launchd/changeset/23610 Author: zarzycki(a)apple.com Date: 2008-04-30 10:29:52 -0700 (Wed, 30 Apr 2008) Log Message: ----------- <rdar://problem/5900690> Extraneous message about caching a Mach port Modified Paths: -------------- trunk/launchd/src/launchd_core_logic.c Modified: trunk/launchd/src/launchd_core_logic.c =================================================================== --- trunk/launchd/src/launchd_core_logic.c 2008-04-28 23:53:08 UTC (rev 23609) +++ trunk/launchd/src/launchd_core_logic.c 2008-04-30 17:29:52 UTC (rev 23610) @@ -2433,6 +2433,8 @@ j->last_exit_status = status; j->sent_sigkill = false; j->sent_kill_via_shmem = false; + j->lastlookup = NULL; + j->lastlookup_gennum = 0; j->p = 0; /*

1 0

[23609] tags/launchd-258.13/
by source_changes＠macosforge.org 28 Apr '08

28 Apr '08

Revision: 23609 http://trac.macosforge.org/projects/launchd/changeset/23609 Author: zarzycki(a)apple.com Date: 2008-04-28 16:53:08 -0700 (Mon, 28 Apr 2008) Log Message: ----------- "Tagging launchd-258.13 from https://svn.macosforge.org/repository/launchd/branches/SULeopard" Added Paths: ----------- tags/launchd-258.13/ Copied: tags/launchd-258.13 (from rev 23608, branches/SULeopard)

1 0

[23608] trunk/launchd/src/launchd_core_logic.c
by source_changes＠macosforge.org 28 Apr '08

28 Apr '08

Revision: 23608 http://trac.macosforge.org/projects/launchd/changeset/23608 Author: zarzycki(a)apple.com Date: 2008-04-28 13:45:11 -0700 (Mon, 28 Apr 2008) Log Message: ----------- <rdar://problem/5884914> HideUntilCheckIn does not wait for bootstrap_check_in() Modified Paths: -------------- trunk/launchd/src/launchd_core_logic.c Modified: trunk/launchd/src/launchd_core_logic.c =================================================================== --- trunk/launchd/src/launchd_core_logic.c 2008-04-28 20:40:36 UTC (rev 23607) +++ trunk/launchd/src/launchd_core_logic.c 2008-04-28 20:45:11 UTC (rev 23608) @@ -6374,7 +6374,7 @@ } if (likely(ms)) { - if (machservice_hidden(ms) && !job_active(machservice_job(ms))) { + if (machservice_hidden(ms) && !machservice_active(ms)) { ms = NULL; } else if (unlikely(ms->per_user_hack)) { ms = NULL;

1 0

[23607] branches/SULeopard/launchd/src/launchd_core_logic.c
by source_changes＠macosforge.org 28 Apr '08

28 Apr '08

Revision: 23607 http://trac.macosforge.org/projects/launchd/changeset/23607 Author: zarzycki(a)apple.com Date: 2008-04-28 13:40:36 -0700 (Mon, 28 Apr 2008) Log Message: ----------- <rdar://problem/5884914> HideUntilCheckIn does not wait for bootstrap_check_in() Modified Paths: -------------- branches/SULeopard/launchd/src/launchd_core_logic.c Modified: branches/SULeopard/launchd/src/launchd_core_logic.c =================================================================== --- branches/SULeopard/launchd/src/launchd_core_logic.c 2008-04-22 20:42:06 UTC (rev 23606) +++ branches/SULeopard/launchd/src/launchd_core_logic.c 2008-04-28 20:40:36 UTC (rev 23607) @@ -5942,7 +5942,7 @@ ms = jobmgr_lookup_service(j->mgr, servicename, true, 0); } - if (ms && machservice_hidden(ms) && !job_active(machservice_job(ms))) { + if (ms && machservice_hidden(ms) && !machservice_active(ms)) { ms = NULL; } else if (ms && ms->per_user_hack) { ms = NULL;

1 0

[23606] tags/launchd-272/
by source_changes＠macosforge.org 22 Apr '08

22 Apr '08

Revision: 23606 http://trac.macosforge.org/projects/launchd/changeset/23606 Author: zarzycki(a)apple.com Date: 2008-04-22 13:42:06 -0700 (Tue, 22 Apr 2008) Log Message: ----------- "Tagging launchd-272 from https://svn.macosforge.org/repository/launchd/trunk" Added Paths: ----------- tags/launchd-272/ Copied: tags/launchd-272 (from rev 23605, trunk)

1 0

[23605] trunk/launchd/src/libvproc.c
by source_changes＠macosforge.org 22 Apr '08

22 Apr '08

Revision: 23605 http://trac.macosforge.org/projects/launchd/changeset/23605 Author: zarzycki(a)apple.com Date: 2008-04-22 13:32:43 -0700 (Tue, 22 Apr 2008) Log Message: ----------- Fix a port leak. Modified Paths: -------------- trunk/launchd/src/libvproc.c Modified: trunk/launchd/src/libvproc.c =================================================================== --- trunk/launchd/src/libvproc.c 2008-04-21 22:01:21 UTC (rev 23604) +++ trunk/launchd/src/libvproc.c 2008-04-22 20:32:43 UTC (rev 23605) @@ -75,6 +75,10 @@ //assert(kr == 0); if (kr) return; + kr = mach_port_deallocate(mach_task_self(), shmem_port); + + //assert(kr == 0); + vproc_shmem = (struct vproc_shmem_s *)vm_addr; }

1 0