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

[23402] trunk/launchd/src/launchd_core_logic.c
by source_changes＠macosforge.org 18 Sep '07

18 Sep '07

Revision: 23402 http://trac.macosforge.org/projects/launchd/changeset/23402 Author: zarzycki(a)apple.com Date: 2007-09-18 07:54:49 -0700 (Tue, 18 Sep 2007) Log Message: ----------- <rdar://problem/5488633> Cancelled FUS restart cause pre-login launchd agent race 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-09-18 01:38:21 UTC (rev 23401) +++ trunk/launchd/src/launchd_core_logic.c 2007-09-18 14:54:49 UTC (rev 23402) @@ -1778,6 +1778,8 @@ LIST_FOREACH(ji, &label_hash[hash_label(label)], label_hash_sle) { if (ji->removal_pending) { continue; /* 5351245 */ + } else if (ji->mgr->shutting_down) { + continue; /* 5488633 */ } if (strcmp(ji->label, label) == 0) {

1 0

[23401] tags/launchd-248/
by source_changes＠macosforge.org 18 Sep '07

18 Sep '07

Revision: 23401 http://trac.macosforge.org/projects/launchd/changeset/23401 Author: zarzycki(a)apple.com Date: 2007-09-17 18:38:21 -0700 (Mon, 17 Sep 2007) Log Message: ----------- "Tagging launchd-248 from https://svn.macosforge.org/repository/launchd/trunk" Added Paths: ----------- tags/launchd-248/ Copied: tags/launchd-248 (from rev 23400, trunk)

1 0

[23400] trunk/launchd/src/launchctl.c
by source_changes＠macosforge.org 18 Sep '07

18 Sep '07

Revision: 23400 http://trac.macosforge.org/projects/launchd/changeset/23400 Author: zarzycki(a)apple.com Date: 2007-09-17 18:37:37 -0700 (Mon, 17 Sep 2007) Log Message: ----------- This just disables source for the embedded world. Modified Paths: -------------- trunk/launchd/src/launchctl.c Modified: trunk/launchd/src/launchctl.c =================================================================== --- trunk/launchd/src/launchctl.c 2007-09-18 01:32:10 UTC (rev 23399) +++ trunk/launchd/src/launchctl.c 2007-09-18 01:37:37 UTC (rev 23400) @@ -29,8 +29,11 @@ #include <CoreFoundation/CoreFoundation.h> #include <CoreFoundation/CFPriv.h> +#include <TargetConditionals.h> +#if !TARGET_OS_EMBEDDED #include <Security/Security.h> #include <Security/AuthSession.h> +#endif #include <IOKit/IOKitLib.h> #include <NSSystemDirectories.h> #include <mach/mach.h> @@ -1592,25 +1595,27 @@ load_launchd_items[4] = "system"; } - if (strcasecmp(session_type, "Background") == 0 || strcasecmp(session_type, "LoginWindow") == 0) { + if (strcasecmp(session_type, VPROCMGR_SESSION_BACKGROUND) == 0 || strcasecmp(session_type, VPROCMGR_SESSION_LOGINWINDOW) == 0) { load_launchd_items[4] = "system"; if (!is_safeboot()) { load_launchd_items[5] = "-D"; load_launchd_items[6] = "local"; the_argc += 2; } - if (strcasecmp(session_type, "LoginWindow") == 0) { + if (strcasecmp(session_type, VPROCMGR_SESSION_LOGINWINDOW) == 0) { load_launchd_items[the_argc] = "/etc/mach_init_per_login_session.d"; the_argc += 1; } - } else if (strcasecmp(session_type, "Aqua") == 0) { + } else if (strcasecmp(session_type, VPROCMGR_SESSION_AQUA) == 0) { load_launchd_items[5] = "/etc/mach_init_per_user.d"; the_argc += 1; } - if (strcasecmp(session_type, "Background") == 0) { +#if !TARGET_OS_EMBEDDED + if (strcasecmp(session_type, VPROCMGR_SESSION_BACKGROUND) == 0) { assumes(SessionCreate(sessionKeepCurrentBootstrap, 0) == 0); } +#endif return load_and_unload_cmd(the_argc, load_launchd_items); }

1 0

[23399] trunk/launchd/src/launchd_core_logic.c
by source_changes＠macosforge.org 18 Sep '07

18 Sep '07

Revision: 23399 http://trac.macosforge.org/projects/launchd/changeset/23399 Author: zarzycki(a)apple.com Date: 2007-09-17 18:32:10 -0700 (Mon, 17 Sep 2007) Log Message: ----------- <rdar://problem/5487989> Regression due to 5475980 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-09-17 21:58:49 UTC (rev 23398) +++ trunk/launchd/src/launchd_core_logic.c 2007-09-18 01:32:10 UTC (rev 23399) @@ -714,6 +714,7 @@ } if (jm->parentmgr) { + runtime_del_ref(); SLIST_REMOVE(&jm->parentmgr->submgrs, jm, jobmgr_s, sle); } else if (getpid() == 1) { jobmgr_log(jm, LOG_DEBUG, "About to call: reboot(%s)", reboot_flags_to_C_names(jm->reboot_flags)); @@ -4228,6 +4229,10 @@ jobmgr_assumes(jmr, job_dispatch(bootstrapper, true) != NULL); } + if (jmr->parentmgr) { + runtime_add_ref(); + } + return jmr; out_bad:

1 0

[23398] tags/launchd-247/
by source_changes＠macosforge.org 17 Sep '07

17 Sep '07

Revision: 23398 http://trac.macosforge.org/projects/launchd/changeset/23398 Author: zarzycki(a)apple.com Date: 2007-09-17 14:58:49 -0700 (Mon, 17 Sep 2007) Log Message: ----------- "Tagging launchd-247 from https://svn.macosforge.org/repository/launchd/trunk" Added Paths: ----------- tags/launchd-247/ Copied: tags/launchd-247 (from rev 23397, trunk)

1 0

[23397] trunk/launchd/src/launchd_core_logic.c
by source_changes＠macosforge.org 17 Sep '07

17 Sep '07

Revision: 23397 http://trac.macosforge.org/projects/launchd/changeset/23397 Author: zarzycki(a)apple.com Date: 2007-09-17 14:58:35 -0700 (Mon, 17 Sep 2007) Log Message: ----------- The first per user launchd may be on behalf of a daemon and not a "real" user. 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-09-17 20:00:36 UTC (rev 23396) +++ trunk/launchd/src/launchd_core_logic.c 2007-09-17 21:58:35 UTC (rev 23397) @@ -452,6 +452,7 @@ static size_t total_children; static mach_port_t the_exception_server; static bool did_first_per_user_launchd_BootCache_hack; +#define JOB_BOOTCACHE_HACK_CHECK(j) (j->per_user && !did_first_per_user_launchd_BootCache_hack && (j->mach_uid >= 500) && (j->mach_uid != (uid_t)-2)) static jobmgr_t background_jobmgr; static job_t workaround_5477111; static mach_timebase_info_data_t tbi; @@ -460,6 +461,7 @@ mach_port_t inherited_bootstrap_port; jobmgr_t root_jobmgr; + void job_ignore(job_t j) { @@ -2450,7 +2452,7 @@ total_children++; LIST_INSERT_HEAD(&j->mgr->active_jobs[ACTIVE_JOB_HASH(c)], j, pid_hash_sle); - if (j->per_user && !did_first_per_user_launchd_BootCache_hack) { + if (JOB_BOOTCACHE_HACK_CHECK(j)) { did_first_per_user_launchd_BootCache_hack = true; } @@ -2512,7 +2514,7 @@ size_t binpref_out_cnt = 0; int i; - if (j->per_user && !did_first_per_user_launchd_BootCache_hack) { + if (JOB_BOOTCACHE_HACK_CHECK(j)) { do_first_per_user_launchd_hack(); }

1 0

[23396] trunk/launchd/src/launchd_core_logic.c
by source_changes＠macosforge.org 17 Sep '07

17 Sep '07

Revision: 23396 http://trac.macosforge.org/projects/launchd/changeset/23396 Author: zarzycki(a)apple.com Date: 2007-09-17 13:00:36 -0700 (Mon, 17 Sep 2007) Log Message: ----------- More documentation. 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-09-17 19:41:22 UTC (rev 23395) +++ trunk/launchd/src/launchd_core_logic.c 2007-09-17 20:00:36 UTC (rev 23396) @@ -1967,6 +1967,19 @@ */ killpg(j->p, SIGKILL); + /* + * 5020256 + * + * The current implementation of ptrace() causes the traced process to + * be abducted away from the true parent and adopted by the tracer. + * + * Once the tracing process relinquishes control, the kernel then + * restores the true parent/child relationship. + * + * Unfortunately, the wait*() family of APIs is unaware of the temporarily + * data structures changes, and they return an error if reality hasn't + * been restored by the time they are called. + */ if (!job_assumes(j, wait4(j->p, &status, 0, &ru) != -1)) { job_log(j, LOG_NOTICE, "Working around 5020256. Assuming the job crashed.");

1 0

[23395] trunk/launchd/src/launchd_core_logic.c
by source_changes＠macosforge.org 17 Sep '07

17 Sep '07

Revision: 23395 http://trac.macosforge.org/projects/launchd/changeset/23395 Author: zarzycki(a)apple.com Date: 2007-09-17 12:41:22 -0700 (Mon, 17 Sep 2007) Log Message: ----------- More fallout from: <rdar://problem/5402927> Bug: launchd_core_logic.c:523 (23327):1: kill(j->p, SIGTERM) != -1 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-09-17 17:27:38 UTC (rev 23394) +++ trunk/launchd/src/launchd_core_logic.c 2007-09-17 19:41:22 UTC (rev 23395) @@ -523,7 +523,7 @@ return; } - job_assumes(j, killpg(j->p, SIGTERM) != -1); + job_assumes(j, kill(j->p, SIGTERM) != -1); j->sent_sigterm_time = mach_absolute_time(); if (j->exit_timeout) { @@ -1955,12 +1955,24 @@ if (j->anonymous) { status = 0; memset(&ru, 0, sizeof(ru)); - } else if (!job_assumes(j, wait4(j->p, &status, 0, &ru) != -1)) { - job_log(j, LOG_NOTICE, "Working around 5020256. Assuming the job crashed."); + } else { + /* + * The job is dead. While the PID/PGID is still known to be + * valid, try to kill abandoned descendant processes. + * + * We'd use job_assumes(), but POSIX defines consistency over + * correctness, and consequently kill/killpg now returns EPERM + * instead of ESRCH. As luck would have it, ESRCH is the only + * error we can ignore. + */ + killpg(j->p, SIGKILL); - status = W_EXITCODE(0, SIGSEGV); + if (!job_assumes(j, wait4(j->p, &status, 0, &ru) != -1)) { + job_log(j, LOG_NOTICE, "Working around 5020256. Assuming the job crashed."); - memset(&ru, 0, sizeof(ru)); + status = W_EXITCODE(0, SIGSEGV); + memset(&ru, 0, sizeof(ru)); + } } if (j->exit_timeout) { @@ -2147,7 +2159,7 @@ return; } - job_assumes(j, killpg(j->p, SIGKILL) != -1); + job_assumes(j, kill(j->p, SIGKILL) != -1); j->sent_sigkill = true;

1 0

[23394] trunk/launchd/src/launchd_core_logic.c
by source_changes＠macosforge.org 17 Sep '07

17 Sep '07

Revision: 23394 http://trac.macosforge.org/projects/launchd/changeset/23394 Author: zarzycki(a)apple.com Date: 2007-09-17 10:27:38 -0700 (Mon, 17 Sep 2007) Log Message: ----------- <rdar://problem/5402927> Bug: launchd_core_logic.c:523 (23327):1: kill(j->p, SIGTERM) != -1 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-09-16 17:37:44 UTC (rev 23393) +++ trunk/launchd/src/launchd_core_logic.c 2007-09-17 17:27:38 UTC (rev 23394) @@ -523,7 +523,7 @@ return; } - job_assumes(j, kill(j->p, SIGTERM) != -1); + job_assumes(j, killpg(j->p, SIGTERM) != -1); j->sent_sigterm_time = mach_absolute_time(); if (j->exit_timeout) { @@ -2147,7 +2147,7 @@ return; } - job_assumes(j, kill(j->p, SIGKILL) != -1); + job_assumes(j, killpg(j->p, SIGKILL) != -1); j->sent_sigkill = true; @@ -2831,7 +2831,11 @@ setenv(ei->key, ei->value, 1); } - job_assumes(j, setsid() != -1); + if (j->per_user) { + job_assumes(j, setsid() != -1); + } else { + job_assumes(j, setpgid(0, 0) != -1); + } } void @@ -3319,7 +3323,7 @@ time_t now = time(NULL); if (ci && (ci->when_next < now)) { - jobmgr_assumes(root_jobmgr, kill(getpid(), SIGUSR1) != -1); + jobmgr_assumes(root_jobmgr, raise(SIGUSR1) != -1); } }

1 0

[23393] tags/launchd-246/
by source_changes＠macosforge.org 16 Sep '07

16 Sep '07

Revision: 23393 http://trac.macosforge.org/projects/launchd/changeset/23393 Author: zarzycki(a)apple.com Date: 2007-09-16 10:37:44 -0700 (Sun, 16 Sep 2007) Log Message: ----------- "Tagging launchd-246 from https://svn.macosforge.org/repository/launchd/trunk" Added Paths: ----------- tags/launchd-246/ Copied: tags/launchd-246 (from rev 23392, trunk)

1 0