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

[23669] branches/PR-6045086/
by source_changes＠macosforge.org 18 Aug '08

18 Aug '08

Revision: 23669 http://trac.macosforge.org/projects/launchd/changeset/23669 Author: dsorresso(a)apple.com Date: 2008-08-18 16:03:07 -0700 (Mon, 18 Aug 2008) Log Message: ----------- Removing bad branch. Removed Paths: ------------- branches/PR-6045086/

1 0

[23668] branches/PR-6045086/
by source_changes＠macosforge.org 18 Aug '08

18 Aug '08

Revision: 23668 http://trac.macosforge.org/projects/launchd/changeset/23668 Author: dsorresso(a)apple.com Date: 2008-08-18 15:47:12 -0700 (Mon, 18 Aug 2008) Log Message: ----------- "Branch for PR-6045086 from https://svn.macosforge.org/repository/launchd/branches/PR-5039559" Added Paths: ----------- branches/PR-6045086/ Copied: branches/PR-6045086 (from rev 23667, branches/PR-5039559)

1 0

[23667] branches/PR-5874233/launchd/src/launchd_core_logic.c
by source_changes＠macosforge.org 18 Aug '08

18 Aug '08

Revision: 23667 http://trac.macosforge.org/projects/launchd/changeset/23667 Author: dsorresso(a)apple.com Date: 2008-08-18 15:17:12 -0700 (Mon, 18 Aug 2008) Log Message: ----------- Now sanitizing LAUNCHD_TRUSTED_FD_ENV before passing it along. Modified Paths: -------------- branches/PR-5874233/launchd/src/launchd_core_logic.c Modified: branches/PR-5874233/launchd/src/launchd_core_logic.c =================================================================== --- branches/PR-5874233/launchd/src/launchd_core_logic.c 2008-08-18 20:34:34 UTC (rev 23666) +++ branches/PR-5874233/launchd/src/launchd_core_logic.c 2008-08-18 22:17:12 UTC (rev 23667) @@ -4176,7 +4176,11 @@ return; } - envitem_new(j, key, launch_data_get_string(obj), j->importing_global_env); + if( strncmp(LAUNCHD_TRUSTED_FD_ENV, key, sizeof(LAUNCHD_TRUSTED_FD_ENV) - 1) ) { + envitem_new(j, key, launch_data_get_string(obj), j->importing_global_env); + } else { + job_log(j, LOG_WARNING, "Not setting %s for job %s.", key, j->label); + } } bool

1 0

[23666] branches/PR-5039559/launchd/src/launchd.c
by source_changes＠macosforge.org 18 Aug '08

18 Aug '08

Revision: 23666 http://trac.macosforge.org/projects/launchd/changeset/23666 Author: dsorresso(a)apple.com Date: 2008-08-18 13:34:34 -0700 (Mon, 18 Aug 2008) Log Message: ----------- Tweaked comment. Got rid of unneeded, commented-out #ifdef. Modified Paths: -------------- branches/PR-5039559/launchd/src/launchd.c Modified: branches/PR-5039559/launchd/src/launchd.c =================================================================== --- branches/PR-5039559/launchd/src/launchd.c 2008-08-15 08:04:45 UTC (rev 23665) +++ branches/PR-5039559/launchd/src/launchd.c 2008-08-18 20:34:34 UTC (rev 23666) @@ -169,15 +169,13 @@ _vproc_transaction_end(); } -//#if TARGET_OS_EMBEDDED if( pid1_magic ) { - /* Start the update thread -- rdar://problem/5039559 */ + /* Start the update thread -- rdar://problem/5039559&6153301 */ pthread_t t = NULL; g_sync_frequency = 30; int err = pthread_create(&t, NULL, update_thread, NULL); launchd_assumes(err == 0); } -//#endif jobmgr_init(sflag);

1 0

[23665] branches/PR-5039559/launchd/src/launchd.c
by source_changes＠macosforge.org 15 Aug '08

15 Aug '08

Revision: 23665 http://trac.macosforge.org/projects/launchd/changeset/23665 Author: dsorresso(a)apple.com Date: 2008-08-15 01:04:45 -0700 (Fri, 15 Aug 2008) Log Message: ----------- Frequency parameter is now a global, eschewing potential complications in passing an unsigned int as a void *. Also makes logic in the new thread loop more concise. Update thread function is now properly typed and returns NULL. Modified Paths: -------------- branches/PR-5039559/launchd/src/launchd.c Modified: branches/PR-5039559/launchd/src/launchd.c =================================================================== --- branches/PR-5039559/launchd/src/launchd.c 2008-08-15 03:51:47 UTC (rev 23664) +++ branches/PR-5039559/launchd/src/launchd.c 2008-08-15 08:04:45 UTC (rev 23665) @@ -67,6 +67,7 @@ #include <setjmp.h> #include <spawn.h> #include <sched.h> +#include <pthread.h> #include "libbootstrap_public.h" #include "libvproc_public.h" @@ -96,7 +97,7 @@ static void fatal_signal_handler(int sig, siginfo_t *si, void *uap); static void handle_pid1_crashes_separately(void); -static void update_thread(unsigned int freq); +static void *update_thread(void *nothing); static bool re_exec_in_single_user_mode; static void *crash_addr; @@ -105,6 +106,7 @@ bool shutdown_in_progress; bool fake_shutdown_in_progress; bool network_up; +unsigned int g_sync_frequency = 0; int main(int argc, char *const *argv) @@ -171,10 +173,9 @@ if( pid1_magic ) { /* Start the update thread -- rdar://problem/5039559 */ pthread_t t = NULL; - int freq = 30; - int err = pthread_create(&t, NULL, (void (*)(void *))update_thread, (void *)freq); + g_sync_frequency = 30; + int err = pthread_create(&t, NULL, update_thread, NULL); launchd_assumes(err == 0); - /* FIXME: Figure out what to do if we fail ... */ } //#endif @@ -200,12 +201,14 @@ launchd_assumes(sigaction(SIGSEGV, &fsa, NULL) != -1); } -static void update_thread(unsigned int freq) +void *update_thread(void *nothing __attribute__((unused))) { - while( true ) { + while( g_sync_frequency ) { sync(); - sleep(freq); + sleep(g_sync_frequency); } + + return NULL; } #define PID1_CRASH_LOGFILE "/var/log/launchd-pid1.crash"

1 0

[23664] branches/PR-5039559/launchd/src/launchd.c
by source_changes＠macosforge.org 15 Aug '08

15 Aug '08

Revision: 23664 http://trac.macosforge.org/projects/launchd/changeset/23664 Author: dsorresso(a)apple.com Date: 2008-08-14 20:51:47 -0700 (Thu, 14 Aug 2008) Log Message: ----------- Changed error checking to use launchd_assumes() and therefore a less snarky error message. Still need to figure out what to do in the case of failure. Probably just exit. Modified Paths: -------------- branches/PR-5039559/launchd/src/launchd.c Modified: branches/PR-5039559/launchd/src/launchd.c =================================================================== --- branches/PR-5039559/launchd/src/launchd.c 2008-08-15 02:20:45 UTC (rev 23663) +++ branches/PR-5039559/launchd/src/launchd.c 2008-08-15 03:51:47 UTC (rev 23664) @@ -168,18 +168,13 @@ } //#if TARGET_OS_EMBEDDED - if( getpid() == 1 ) { + if( pid1_magic ) { /* Start the update thread -- rdar://problem/5039559 */ pthread_t t = NULL; int freq = 30; int err = pthread_create(&t, NULL, (void (*)(void *))update_thread, (void *)freq); - if( err != 0 ) { - /* If we hit this condition, there's something horribly wrong. - * We're the first process; we shouldn't be running out of threads or anything - * whacky like that. - */ - fprintf(stderr, "%s: Dude, your system is seriously messed up (%d - %s). I'm guessing you'll crash very soon.\n", getprogname(), err, strerror(err)); - } + launchd_assumes(err == 0); + /* FIXME: Figure out what to do if we fail ... */ } //#endif

1 0

[23663] branches/PR-5039559/launchd/src/launchd.c
by source_changes＠macosforge.org 15 Aug '08

15 Aug '08

Revision: 23663 http://trac.macosforge.org/projects/launchd/changeset/23663 Author: dsorresso(a)apple.com Date: 2008-08-14 19:20:45 -0700 (Thu, 14 Aug 2008) Log Message: ----------- Added update thread. No parameter grabbing yet though. Modified Paths: -------------- branches/PR-5039559/launchd/src/launchd.c Modified: branches/PR-5039559/launchd/src/launchd.c =================================================================== --- branches/PR-5039559/launchd/src/launchd.c 2008-08-14 21:16:49 UTC (rev 23662) +++ branches/PR-5039559/launchd/src/launchd.c 2008-08-15 02:20:45 UTC (rev 23663) @@ -96,6 +96,8 @@ static void fatal_signal_handler(int sig, siginfo_t *si, void *uap); static void handle_pid1_crashes_separately(void); +static void update_thread(unsigned int freq); + static bool re_exec_in_single_user_mode; static void *crash_addr; static pid_t crash_pid; @@ -165,6 +167,22 @@ _vproc_transaction_end(); } +//#if TARGET_OS_EMBEDDED + if( getpid() == 1 ) { + /* Start the update thread -- rdar://problem/5039559 */ + pthread_t t = NULL; + int freq = 30; + int err = pthread_create(&t, NULL, (void (*)(void *))update_thread, (void *)freq); + if( err != 0 ) { + /* If we hit this condition, there's something horribly wrong. + * We're the first process; we shouldn't be running out of threads or anything + * whacky like that. + */ + fprintf(stderr, "%s: Dude, your system is seriously messed up (%d - %s). I'm guessing you'll crash very soon.\n", getprogname(), err, strerror(err)); + } + } +//#endif + jobmgr_init(sflag); launchd_runtime_init2(); @@ -187,6 +205,14 @@ launchd_assumes(sigaction(SIGSEGV, &fsa, NULL) != -1); } +static void update_thread(unsigned int freq) +{ + while( true ) { + sync(); + sleep(freq); + } +} + #define PID1_CRASH_LOGFILE "/var/log/launchd-pid1.crash" /* This hack forces the dynamic linker to resolve these symbols ASAP */

1 0

[23662] branches/PR-5039559/
by source_changes＠macosforge.org 14 Aug '08

14 Aug '08

Revision: 23662 http://trac.macosforge.org/projects/launchd/changeset/23662 Author: dsorresso(a)apple.com Date: 2008-08-14 14:16:49 -0700 (Thu, 14 Aug 2008) Log Message: ----------- "Branch for PR-5039559 from https://svn.macosforge.org/repository/launchd/trunk" Added Paths: ----------- branches/PR-5039559/ Copied: branches/PR-5039559 (from rev 23661, trunk)

1 0

[23661] branches/PR-5039559/
by source_changes＠macosforge.org 14 Aug '08

14 Aug '08

Revision: 23661 http://trac.macosforge.org/projects/launchd/changeset/23661 Author: dsorresso(a)apple.com Date: 2008-08-14 14:15:30 -0700 (Thu, 14 Aug 2008) Log Message: ----------- Removing bad branch. Removed Paths: ------------- branches/PR-5039559/

1 0

[23660] branches/PR-5039559/
by source_changes＠macosforge.org 14 Aug '08

14 Aug '08

Revision: 23660 http://trac.macosforge.org/projects/launchd/changeset/23660 Author: dsorresso(a)apple.com Date: 2008-08-14 14:08:58 -0700 (Thu, 14 Aug 2008) Log Message: ----------- "Branch for PR-5039559 from https://svn.macosforge.org/repository/launchd/branches/PR-5923864" Added Paths: ----------- branches/PR-5039559/ Copied: branches/PR-5039559 (from rev 23659, branches/PR-5923864)

1 0