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

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

11 Sep '07

Revision: 23372 http://trac.macosforge.org/projects/launchd/changeset/23372 Author: zarzycki(a)apple.com Date: 2007-09-11 16:49:02 -0700 (Tue, 11 Sep 2007) Log Message: ----------- Comments are good. 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-11 23:44:27 UTC (rev 23371) +++ trunk/launchd/src/launchd_core_logic.c 2007-09-11 23:49:02 UTC (rev 23372) @@ -2305,6 +2305,11 @@ return; } + /* + * Some users adjust the wall-clock and then expect software to not notice. + * Therefore, launchd must use an absolute clock instead of gettimeofday() + * or time() wherever possible. + */ td = (tnow - j->start_time) * tbi.numer / tbi.denom; td /= NSEC_PER_SEC;

1 0

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

11 Sep '07

Revision: 23371 http://trac.macosforge.org/projects/launchd/changeset/23371 Author: zarzycki(a)apple.com Date: 2007-09-11 16:44:27 -0700 (Tue, 11 Sep 2007) Log Message: ----------- More wall-clock versus absolute-clock fun... 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-11 20:15:17 UTC (rev 23370) +++ trunk/launchd/src/launchd_core_logic.c 2007-09-11 23:44:27 UTC (rev 23371) @@ -348,7 +348,7 @@ unsigned int timeout; unsigned int exit_timeout; int stdout_err_fd; - struct timeval sent_sigterm_time; + uint64_t sent_sigterm_time; uint64_t start_time; uint32_t min_run_time; unsigned int start_interval; @@ -447,12 +447,14 @@ static size_t our_strhash(const char *s) __attribute__((pure)); static void extract_rcsid_substr(const char *i, char *o, size_t osz); static void do_first_per_user_launchd_hack(void); +static void do_file_init(void) __attribute__((constructor)); /* file local globals */ static unsigned int total_children; static mach_port_t the_exception_server; static bool did_first_per_user_launchd_BootCache_hack; static jobmgr_t background_jobmgr; +static mach_timebase_info_data_t tbi; /* process wide globals */ mach_port_t inherited_bootstrap_port; @@ -522,7 +524,7 @@ } job_assumes(j, kill(j->p, SIGTERM) != -1); - job_assumes(j, gettimeofday(&j->sent_sigterm_time, NULL) != -1); + j->sent_sigterm_time = mach_absolute_time(); if (j->exit_timeout) { job_assumes(j, kevent_mod((uintptr_t)&j->exit_timeout, EVFILT_TIMER, @@ -1898,7 +1900,6 @@ void job_reap(job_t j) { - struct timeval tve, tvd; struct rusage ru; int status; @@ -1943,19 +1944,20 @@ total_children--; LIST_REMOVE(j, pid_hash_sle); - job_assumes(j, gettimeofday(&tve, NULL) != -1); - if (j->wait_reply_port) { job_log(j, LOG_DEBUG, "MPM wait reply being sent"); job_assumes(j, job_mig_wait_reply(j->wait_reply_port, 0, status) == 0); j->wait_reply_port = MACH_PORT_NULL; } - if (j->sent_sigterm_time.tv_sec) { - timersub(&tve, &j->sent_sigterm_time, &tvd); + if (j->sent_sigterm_time) { + uint64_t td_sec, td_usec, td = (mach_absolute_time() - j->sent_sigterm_time) * tbi.numer / tbi.denom; - job_log(j, LOG_INFO, "Exited %ld.%06d seconds after %s was sent", - tvd.tv_sec, tvd.tv_usec, signal_to_C_name(j->sent_sigkill ? SIGKILL : SIGTERM)); + td_sec = td / NSEC_PER_SEC; + td_usec = (td % NSEC_PER_SEC) / NSEC_PER_USEC; + + job_log(j, LOG_INFO, "Exited %lld.%06lld seconds after %s was sent", + td_sec, td_usec, signal_to_C_name(j->sent_sigkill ? SIGKILL : SIGTERM)); } #if DO_RUSAGE_SUMMATION @@ -2175,12 +2177,12 @@ job_dispatch(j, false); } else if (&j->exit_timeout == ident) { if (j->sent_sigkill) { - struct timeval tvd, tve; + uint64_t td = (mach_absolute_time() - j->sent_sigterm_time) * tbi.numer / tbi.denom; - job_assumes(j, gettimeofday(&tve, NULL) != -1); - timersub(&tve, &j->sent_sigterm_time, &tvd); - tvd.tv_sec -= j->exit_timeout; - job_log(j, LOG_ERR, "Did not die after sending SIGKILL %lu seconds ago...", tvd.tv_sec); + td /= NSEC_PER_SEC; + td -= j->exit_timeout; + + job_log(j, LOG_ERR, "Did not die after sending SIGKILL %llu seconds ago...", td); } else { job_force_sampletool(j); if (j->debug_before_kill) { @@ -2285,7 +2287,6 @@ void job_start(job_t j) { - static mach_timebase_info_data_t tbi; uint64_t td, tnow = mach_absolute_time(); int spair[2]; int execspair[2]; @@ -2295,10 +2296,6 @@ bool sipc = false; u_int proc_fflags = /* NOTE_EXEC|NOTE_FORK| */ NOTE_EXIT /* |NOTE_REAP */; - if (tbi.denom == 0) { - launchd_assert(mach_timebase_info(&tbi) == 0); - } - if (!job_assumes(j, j->mgr != NULL)) { return; } @@ -2320,8 +2317,7 @@ return; } - j->sent_sigterm_time.tv_sec = 0; - j->sent_sigterm_time.tv_usec = 0; + j->sent_sigterm_time = 0; if (!j->legacy_mach_job) { sipc = (!SLIST_EMPTY(&j->sockets) || !SLIST_EMPTY(&j->machservices)); @@ -6324,3 +6320,10 @@ free(w4r); } + +void +do_file_init(void) +{ + launchd_assert(mach_timebase_info(&tbi) == 0); + +}

1 0

[23370] tags/launchd-243/
by source_changes＠macosforge.org 11 Sep '07

11 Sep '07

Revision: 23370 http://trac.macosforge.org/projects/launchd/changeset/23370 Author: zarzycki(a)apple.com Date: 2007-09-11 13:15:17 -0700 (Tue, 11 Sep 2007) Log Message: ----------- "Tagging launchd-243 from https://svn.macosforge.org/repository/launchd/trunk" Added Paths: ----------- tags/launchd-243/ Copied: tags/launchd-243 (from rev 23369, trunk)

1 0

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

11 Sep '07

Revision: 23369 http://trac.macosforge.org/projects/launchd/changeset/23369 Author: zarzycki(a)apple.com Date: 2007-09-11 13:05:15 -0700 (Tue, 11 Sep 2007) Log Message: ----------- <rdar://problem/5418922> modifying the date/time confuses launchd's timers 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-10 20:43:52 UTC (rev 23368) +++ trunk/launchd/src/launchd_core_logic.c 2007-09-11 20:05:15 UTC (rev 23369) @@ -23,6 +23,7 @@ #include <mach/mach.h> #include <mach/mach_error.h> +#include <mach/mach_time.h> #include <mach/boolean.h> #include <mach/message.h> #include <mach/notify.h> @@ -348,8 +349,8 @@ unsigned int exit_timeout; int stdout_err_fd; struct timeval sent_sigterm_time; - time_t start_time; - time_t min_run_time; + uint64_t start_time; + uint32_t min_run_time; unsigned int start_interval; unsigned int checkedin:1, anonymous:1, debug:1, inetcompat:1, inetcompat_wait:1, ondemand:1, session_create:1, low_pri_io:1, no_init_groups:1, priv_port_has_senders:1, @@ -2284,15 +2285,20 @@ void job_start(job_t j) { + static mach_timebase_info_data_t tbi; + uint64_t td, tnow = mach_absolute_time(); int spair[2]; int execspair[2]; int oepair[2]; char nbuf[64]; pid_t c; bool sipc = false; - time_t td; u_int proc_fflags = /* NOTE_EXEC|NOTE_FORK| */ NOTE_EXIT /* |NOTE_REAP */; + if (tbi.denom == 0) { + launchd_assert(mach_timebase_info(&tbi) == 0); + } + if (!job_assumes(j, j->mgr != NULL)) { return; } @@ -2302,7 +2308,8 @@ return; } - td = time(NULL) - j->start_time; + td = (tnow - j->start_time) * tbi.numer / tbi.denom; + td /= NSEC_PER_SEC; if (td < j->min_run_time && !j->legacy_mach_job && !j->inetcompat) { time_t respawn_delta = j->min_run_time - td; @@ -2334,7 +2341,7 @@ job_assumes(j, kevent_mod(j->log_redirect_fd, EVFILT_READ, EV_ADD, 0, 0, j) != -1); } - time(&j->start_time); + j->start_time = tnow; switch (c = runtime_fork(j->weird_bootstrap ? j->j_port : j->mgr->jm_port)) { case -1:

1 0

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

10 Sep '07

Revision: 23368 http://trac.macosforge.org/projects/launchd/changeset/23368 Author: zarzycki(a)apple.com Date: 2007-09-10 13:43:52 -0700 (Mon, 10 Sep 2007) Log Message: ----------- We only need/want the "Still alive" check if launchd has been idle for a while... 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-10 20:41:56 UTC (rev 23367) +++ trunk/launchd/src/launchd_core_logic.c 2007-09-10 20:43:52 UTC (rev 23368) @@ -639,6 +639,14 @@ return r; } +static void +still_alive_with_check(void) +{ + jobmgr_log(root_jobmgr, LOG_NOTICE, "Still alive with %u children.", total_children); + + runtime_closelog(); /* hack to flush logs */ +} + jobmgr_t jobmgr_shutdown(jobmgr_t jm) { @@ -662,7 +670,7 @@ } if (debug_shutdown_hangs && jm->parentmgr == NULL && getpid() == 1) { - jobmgr_assumes(jm, kevent_mod((uintptr_t)jm, EVFILT_TIMER, EV_ADD, NOTE_SECONDS, 3, jm) != -1); + runtime_set_timeout(still_alive_with_check, 3000); } return jobmgr_do_garbage_collection(jm); @@ -2241,11 +2249,8 @@ jobmgr_dispatch_all_semaphores(jm); break; case EVFILT_TIMER: - if (kev->ident == (uintptr_t)&sorted_calendar_events) { + if (jobmgr_assumes(jm, kev->ident == (uintptr_t)&sorted_calendar_events)) { calendarinterval_callback(); - } else { - jobmgr_log(jm, LOG_NOTICE, "Still alive with %u children.", total_children); - runtime_closelog(); /* hack to flush logs */ } break; default:

1 0

[23367] trunk/launchd/src/launchd.plist.5
by source_changes＠macosforge.org 10 Sep '07

10 Sep '07

Revision: 23367 http://trac.macosforge.org/projects/launchd/changeset/23367 Author: zarzycki(a)apple.com Date: 2007-09-10 13:41:56 -0700 (Mon, 10 Sep 2007) Log Message: ----------- <rdar://problem/5425348> GroupName key now ignored when UserName key is not set Modified Paths: -------------- trunk/launchd/src/launchd.plist.5 Modified: trunk/launchd/src/launchd.plist.5 =================================================================== --- trunk/launchd/src/launchd.plist.5 2007-09-10 20:40:29 UTC (rev 23366) +++ trunk/launchd/src/launchd.plist.5 2007-09-10 20:41:56 UTC (rev 23367) @@ -90,7 +90,6 @@ This optional key specifies the user to run the job as. This key is only applicable when launchd is running as root. .It Sy GroupName <string> This optional key specifies the group to run the job as. This key is only applicable when launchd is running as root. If UserName is set and GroupName is not, the the group will be set to the default group of the user. -The GroupName key is ignored without the UserName key. .It Sy inetdCompatibility <dictionary> The presence of this key specifies that the daemon expects to be run as if it were launched from inetd. .Bl -ohang -offset indent

1 0

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

10 Sep '07

Revision: 23366 http://trac.macosforge.org/projects/launchd/changeset/23366 Author: zarzycki(a)apple.com Date: 2007-09-10 13:40:29 -0700 (Mon, 10 Sep 2007) Log Message: ----------- <rdar://problem/5425348> GroupName key now ignored when UserName key is not set 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-10 18:38:14 UTC (rev 23365) +++ trunk/launchd/src/launchd_core_logic.c 2007-09-10 20:40:29 UTC (rev 23366) @@ -2619,6 +2619,14 @@ return; } + /* + * I contend that having UID == 0 and GID != 0 is of dubious value. + * Nevertheless, this used to work in Tiger. See: 5425348 + */ + if (j->groupname && !j->username) { + j->username = "root"; + } + if (j->username) { if ((pwe = getpwnam(j->username)) == NULL) { job_log(j, LOG_ERR, "getpwnam(\"%s\") failed", j->username);

1 0

[23365] trunk/launchd/src/launchd_runtime.c
by source_changes＠macosforge.org 10 Sep '07

10 Sep '07

Revision: 23365 http://trac.macosforge.org/projects/launchd/changeset/23365 Author: zarzycki(a)apple.com Date: 2007-09-10 11:38:14 -0700 (Mon, 10 Sep 2007) Log Message: ----------- Better error reporting. Modified Paths: -------------- trunk/launchd/src/launchd_runtime.c Modified: trunk/launchd/src/launchd_runtime.c =================================================================== --- trunk/launchd/src/launchd_runtime.c 2007-09-09 20:18:42 UTC (rev 23364) +++ trunk/launchd/src/launchd_runtime.c 2007-09-10 18:38:14 UTC (rev 23365) @@ -1269,7 +1269,7 @@ tmp_port = drain_reply_port; drain_reply_port = MACH_PORT_NULL; - if (!launchd_assumes(job_mig_log_drain_reply(tmp_port, 0, outval, outvalCnt) == 0)) { + if (!launchd_assumes((errno = job_mig_log_drain_reply(tmp_port, 0, outval, outvalCnt)) == 0)) { launchd_assumes(launchd_mport_deallocate(tmp_port) == KERN_SUCCESS); }

1 0

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

09 Sep '07

Revision: 23364 http://trac.macosforge.org/projects/launchd/changeset/23364 Author: zarzycki(a)apple.com Date: 2007-09-09 13:18:42 -0700 (Sun, 09 Sep 2007) Log Message: ----------- I am not launchd, and launchd is not me. 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-09 19:10:06 UTC (rev 23363) +++ trunk/launchd/src/launchd_core_logic.c 2007-09-09 20:18:42 UTC (rev 23364) @@ -3985,7 +3985,7 @@ jobmgr_log(jm, LOG_WARNING, "Stray %sprocess at shutdown: PID %u PPID %u %s", z, p_i, pp_i, n); /* - * The kernel team requested that I not do this for Leopard. + * The kernel team requested that launchd not do this for Leopard. * jobmgr_assumes(jm, kill(p_i, SIGKILL) != -1); */ }

1 0

[23363] tags/launchd-242/
by source_changes＠macosforge.org 09 Sep '07

09 Sep '07

Revision: 23363 http://trac.macosforge.org/projects/launchd/changeset/23363 Author: zarzycki(a)apple.com Date: 2007-09-09 12:10:06 -0700 (Sun, 09 Sep 2007) Log Message: ----------- "Tagging launchd-242 from https://svn.macosforge.org/repository/launchd/trunk" Added Paths: ----------- tags/launchd-242/ Copied: tags/launchd-242 (from rev 23362, trunk)

1 0