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

[23476] trunk/launchd/src/launchd_core_logic.c
by source_changes＠macosforge.org 21 Dec '07

21 Dec '07

Revision: 23476 http://trac.macosforge.org/projects/launchd/changeset/23476 Author: zarzycki(a)apple.com Date: 2007-12-21 13:53:37 -0800 (Fri, 21 Dec 2007) Log Message: ----------- <rdar://problem/5317778> Bug: launchd_core_logic.c:5810 (23281):0: mspolicy_new(target_j, target_service, flags & BOOTSTRAP_ALLOW_LOOKUP, flags & BOOTSTRAP_PER_PID_SERVICE, false) 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-12-21 21:37:17 UTC (rev 23475) +++ trunk/launchd/src/launchd_core_logic.c 2007-12-21 21:53:37 UTC (rev 23476) @@ -6522,7 +6522,11 @@ if (SLIST_EMPTY(&j->mspolicies)) { job_log(j, LOG_DEBUG, "Setting policy on job \"%s\" for Mach service: %s", target_j->label, target_service); if (target_service[0]) { - job_assumes(j, mspolicy_new(target_j, target_service, flags & BOOTSTRAP_ALLOW_LOOKUP, flags & BOOTSTRAP_PER_PID_SERVICE, false)); + bool r = mspolicy_new(target_j, target_service, flags & BOOTSTRAP_ALLOW_LOOKUP, flags & BOOTSTRAP_PER_PID_SERVICE, false); + + if (unlikely(!r) && job_assumes(j, errno == EEXIST)) { + job_log(j, LOG_ERR, "Tried to update a known policy on PID %u: %s", target_pid, target_service); + } } else { target_j->deny_unknown_mslookups = !(flags & BOOTSTRAP_ALLOW_LOOKUP); } @@ -6668,6 +6672,7 @@ if (msp->per_pid != pid_local) { continue; } else if (strcmp(msp->name, name) == 0) { + errno = EEXIST; return false; } }

1 0

[23475] trunk/launchd/src/launchd_core_logic.c
by source_changes＠macosforge.org 21 Dec '07

21 Dec '07

Revision: 23475 http://trac.macosforge.org/projects/launchd/changeset/23475 Author: zarzycki(a)apple.com Date: 2007-12-21 13:37:17 -0800 (Fri, 21 Dec 2007) Log Message: ----------- Added likely() / unlikely() usage. 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-12-21 21:06:36 UTC (rev 23474) +++ trunk/launchd/src/launchd_core_logic.c 2007-12-21 21:37:17 UTC (rev 23475) @@ -582,7 +582,7 @@ if (j->stderrpath && (tmp = launch_data_new_string(j->stderrpath))) { launch_data_dict_insert(r, tmp, LAUNCH_JOBKEY_STANDARDERRORPATH); } - if (j->argv && (tmp = launch_data_alloc(LAUNCH_DATA_ARRAY))) { + if (likely(j->argv) && (tmp = launch_data_alloc(LAUNCH_DATA_ARRAY))) { int i; for (i = 0; i < j->argc; i++) { @@ -857,7 +857,7 @@ if (j->prog) { free(j->prog); } - if (j->argv) { + if (likely(j->argv)) { free(j->argv); } if (j->rootdir) { @@ -1080,7 +1080,7 @@ return NULL; } - if (kp.kp_proc.p_stat == SZOMB) { + if (unlikely(kp.kp_proc.p_stat == SZOMB)) { jobmgr_log(jm, LOG_DEBUG, "Tried to create an anonymous job for zombie PID %u: %s", anonpid, kp.kp_proc.p_comm); } @@ -1136,7 +1136,7 @@ /* anonymous process reaping is messy */ LIST_INSERT_HEAD(&jm->active_jobs[ACTIVE_JOB_HASH(jr->p)], jr, pid_hash_sle); - if (kevent_mod(jr->p, EVFILT_PROC, EV_ADD, proc_fflags, 0, root_jobmgr) == -1 && job_assumes(jr, errno == ESRCH)) { + if (unlikely(kevent_mod(jr->p, EVFILT_PROC, EV_ADD, proc_fflags, 0, root_jobmgr) == -1) && job_assumes(jr, errno == ESRCH)) { /* zombies are weird */ job_log(jr, LOG_ERR, "Failed to add kevent for PID %u. Will unload at MIG return", jr->p); jr->unload_at_mig_return = true; @@ -1173,12 +1173,12 @@ launchd_assert(offsetof(struct job_s, kqjob_callback) == 0); - if (jm->shutting_down) { + if (unlikely(jm->shutting_down)) { errno = EINVAL; return NULL; } - if (prog == NULL && argv == NULL) { + if (unlikely(prog == NULL && argv == NULL)) { errno = EINVAL; return NULL; } @@ -1220,9 +1220,10 @@ } } - if (argv) { - while (*argv_tmp++) + if (likely(argv)) { + while (*argv_tmp++) { j->argc++; + } for (i = 0; i < j->argc; i++) { cc += strlen(argv[i]) + 1; @@ -1522,9 +1523,9 @@ case 'e': case 'E': if (strcasecmp(key, LAUNCH_JOBKEY_EXITTIMEOUT) == 0) { - if (value < 0) { + if (unlikely(value < 0)) { job_log(j, LOG_WARNING, "%s less than zero. Ignoring.", LAUNCH_JOBKEY_EXITTIMEOUT); - } else if (value > UINT32_MAX) { + } else if (unlikely(value > UINT32_MAX)) { job_log(j, LOG_WARNING, "%s is too large. Ignoring.", LAUNCH_JOBKEY_EXITTIMEOUT); } else { j->exit_timeout = value; @@ -1541,9 +1542,9 @@ case 't': case 'T': if (strcasecmp(key, LAUNCH_JOBKEY_TIMEOUT) == 0) { - if (value < 0) { + if (unlikely(value < 0)) { job_log(j, LOG_WARNING, "%s less than zero. Ignoring.", LAUNCH_JOBKEY_TIMEOUT); - } else if (value > UINT32_MAX) { + } else if (unlikely(value > UINT32_MAX)) { job_log(j, LOG_WARNING, "%s is too large. Ignoring.", LAUNCH_JOBKEY_TIMEOUT); } else { j->timeout = value; @@ -1568,9 +1569,9 @@ case 's': case 'S': if (strcasecmp(key, LAUNCH_JOBKEY_STARTINTERVAL) == 0) { - if (value <= 0) { + if (unlikely(value <= 0)) { job_log(j, LOG_WARNING, "%s is not greater than zero. Ignoring.", LAUNCH_JOBKEY_STARTINTERVAL); - } else if (value > UINT32_MAX) { + } else if (unlikely(value > UINT32_MAX)) { job_log(j, LOG_WARNING, "%s is too large. Ignoring.", LAUNCH_JOBKEY_STARTINTERVAL); } else { runtime_add_ref(); @@ -1759,7 +1760,7 @@ job_t j = context; launch_data_type_t kind; - if (obj == NULL) { + if (!launchd_assumes(obj != NULL)) { return; } @@ -1798,7 +1799,7 @@ const char **argv = NULL; job_t j; - if (pload == NULL) { + if (!launchd_assumes(pload != NULL)) { errno = EINVAL; return NULL; } @@ -1854,7 +1855,7 @@ argv[i] = NULL; } - if ((j = job_find(label)) != NULL) { + if (unlikely((j = job_find(label)) != NULL)) { errno = EEXIST; return NULL; } else if (label[0] == '\0' || (strncasecmp(label, "", strlen("com.apple.launchd")) == 0) || @@ -2756,7 +2757,7 @@ } g.gl_pathv[0] = (char *)file2exec; argv = (const char **)g.gl_pathv; - } else if (j->argv) { + } else if (likely(j->argv)) { argv = alloca((j->argc + 2) * sizeof(char *)); argv[0] = file2exec; for (i = 0; i < j->argc; i++) { @@ -3998,7 +3999,7 @@ { if (j->prog) { return j->prog; - } else if (j->argv) { + } else if (likely(j->argv)) { return j->argv[0]; } else { return "";

1 0

[23474] trunk/launchd/src/launchd_core_logic.c
by source_changes＠macosforge.org 21 Dec '07

21 Dec '07

Revision: 23474 http://trac.macosforge.org/projects/launchd/changeset/23474 Author: zarzycki(a)apple.com Date: 2007-12-21 13:06:36 -0800 (Fri, 21 Dec 2007) Log Message: ----------- <rdar://problem/5652211> Bug: launchd_core_logic.c:6375 (23433):0: (target_j = jobmgr_find_by_pid(j->mgr, target_pid, true)) != NULL 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-12-20 00:43:45 UTC (rev 23473) +++ trunk/launchd/src/launchd_core_logic.c 2007-12-21 21:06:36 UTC (rev 23474) @@ -405,9 +405,9 @@ static void job_callback_read(job_t j, int ident); static void job_log_stray_pg(job_t j); static void job_log_chidren_without_exec(job_t j); -static job_t job_new_anonymous(jobmgr_t jm, pid_t anonpid); -static job_t job_new(jobmgr_t jm, const char *label, const char *prog, const char *const *argv); -static job_t job_new_via_mach_init(job_t j, const char *cmd, uid_t uid, bool ond); +static job_t job_new_anonymous(jobmgr_t jm, pid_t anonpid) __attribute__((malloc, nonnull, warn_unused_result)); +static job_t job_new(jobmgr_t jm, const char *label, const char *prog, const char *const *argv) __attribute__((malloc, nonnull(1,2), warn_unused_result)); +static job_t job_new_via_mach_init(job_t j, const char *cmd, uid_t uid, bool ond) __attribute__((malloc, nonnull, warn_unused_result)); static const char *job_prog(job_t j); static jobmgr_t job_get_bs(job_t j); static void job_kill(job_t j); @@ -1055,11 +1055,13 @@ gid_t kp_egid, kp_gid, kp_svgid; if (!jobmgr_assumes(jm, anonpid != 0)) { + errno = EINVAL; return NULL; } if (!jobmgr_assumes(jm, anonpid < 100000)) { /* The kernel current defines PID_MAX to be 99999, but that define isn't exported */ + errno = EINVAL; return NULL; } @@ -1074,6 +1076,7 @@ } if (!jobmgr_assumes(jm, kp.kp_proc.p_comm[0] != '\0')) { + errno = EINVAL; return NULL; } @@ -6502,6 +6505,15 @@ return BOOTSTRAP_NO_MEMORY; } + target_j = jobmgr_find_by_pid(j->mgr, target_pid, true); + + if (unlikely(target_j == NULL)) { + if (job_assumes(j, errno == ESRCH)) { + job_log(j, LOG_ERR, "Could not find PID %u while trying to set Mach bootstrap service policy: %s", target_pid, target_service); + } + return BOOTSTRAP_NO_MEMORY; + } + if (!job_assumes(j, (target_j = jobmgr_find_by_pid(j->mgr, target_pid, true)) != NULL)) { return BOOTSTRAP_NO_MEMORY; }

1 0

[23473] trunk/launchd/src/launchd_core_logic.c
by source_changes＠macosforge.org 20 Dec '07

20 Dec '07

Revision: 23473 http://trac.macosforge.org/projects/launchd/changeset/23473 Author: zarzycki(a)apple.com Date: 2007-12-19 16:43:45 -0800 (Wed, 19 Dec 2007) Log Message: ----------- Misc. 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-12-19 22:29:16 UTC (rev 23472) +++ trunk/launchd/src/launchd_core_logic.c 2007-12-20 00:43:45 UTC (rev 23473) @@ -1069,6 +1069,7 @@ if (len != sizeof(kp)) { jobmgr_log(jm, LOG_DEBUG, "Tried to create an anonymous job for nonexistent PID: %u", anonpid); + errno = ESRCH; return NULL; }

1 0

[23472] trunk/launchd/src/launchd_runtime.c
by source_changes＠macosforge.org 19 Dec '07

19 Dec '07

Revision: 23472 http://trac.macosforge.org/projects/launchd/changeset/23472 Author: zarzycki(a)apple.com Date: 2007-12-19 14:29:16 -0800 (Wed, 19 Dec 2007) Log Message: ----------- Small optimization. Modified Paths: -------------- trunk/launchd/src/launchd_runtime.c Modified: trunk/launchd/src/launchd_runtime.c =================================================================== --- trunk/launchd/src/launchd_runtime.c 2007-12-19 19:48:57 UTC (rev 23471) +++ trunk/launchd/src/launchd_runtime.c 2007-12-19 22:29:16 UTC (rev 23472) @@ -112,6 +112,7 @@ static void do_file_init(void) __attribute__((constructor)); static mach_timebase_info_data_t tbi; +static double tbi_float_val; static const int sigigns[] = { SIGHUP, SIGINT, SIGPIPE, SIGALRM, SIGTERM, SIGURG, SIGTSTP, SIGTSTP, SIGCONT, SIGTTIN, SIGTTOU, SIGIO, SIGXCPU, @@ -1583,8 +1584,7 @@ o /= tbi.denom; } else { double d = o; - d *= tbi.numer; - d /= tbi.denom; + d *= tbi_float_val; o = d; } } @@ -1596,5 +1596,7 @@ do_file_init(void) { launchd_assert(mach_timebase_info(&tbi) == 0); + tbi_float_val = tbi.numer; + tbi_float_val /= tbi.denom; }

1 0

[23471] trunk/launchd/src
by source_changes＠macosforge.org 19 Dec '07

19 Dec '07

Revision: 23471 http://trac.macosforge.org/projects/launchd/changeset/23471 Author: zarzycki(a)apple.com Date: 2007-12-19 11:48:57 -0800 (Wed, 19 Dec 2007) Log Message: ----------- Both Mach and Unix time concepts are weird. We now use an 'int64_t' instead of 'struct timeval' for wall clock code. We now wrap the 'timebase info' logic required by Mach absolute time. Modified Paths: -------------- trunk/launchd/src/launchd.c trunk/launchd/src/launchd_core_logic.c trunk/launchd/src/launchd_runtime.c trunk/launchd/src/launchd_runtime.h trunk/launchd/src/libvproc_internal.h Modified: trunk/launchd/src/launchd.c =================================================================== --- trunk/launchd/src/launchd.c 2007-12-19 18:13:19 UTC (rev 23470) +++ trunk/launchd/src/launchd.c 2007-12-19 19:48:57 UTC (rev 23471) @@ -245,7 +245,7 @@ void launchd_shutdown(void) { - struct timeval tvnow; + int64_t now; if (shutdown_in_progress) { return; @@ -264,10 +264,10 @@ runtime_log_push(); - if (launchd_assumes(gettimeofday(&tvnow, NULL) != -1)) { - runtime_syslog(LOG_NOTICE, "Shutdown began at: %lu.%06u", tvnow.tv_sec, tvnow.tv_usec); - } + now = runtime_get_wall_time(); + runtime_syslog(LOG_NOTICE, "Shutdown began at: %lld.%06llu", now / USEC_PER_SEC, now % USEC_PER_SEC); + launchd_assert(jobmgr_shutdown(root_jobmgr) != NULL); } Modified: trunk/launchd/src/launchd_core_logic.c =================================================================== --- trunk/launchd/src/launchd_core_logic.c 2007-12-19 18:13:19 UTC (rev 23470) +++ trunk/launchd/src/launchd_core_logic.c 2007-12-19 19:48:57 UTC (rev 23471) @@ -23,7 +23,6 @@ #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> @@ -452,7 +451,6 @@ 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)); static void do_unmounts(void); /* file local globals */ @@ -463,7 +461,6 @@ #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; /* process wide globals */ mach_port_t inherited_bootstrap_port; @@ -539,7 +536,7 @@ } job_assumes(j, runtime_kill(j->p, SIGTERM) != -1); - j->sent_sigterm_time = mach_absolute_time(); + j->sent_sigterm_time = runtime_get_opaque_time(); if (j->exit_timeout) { job_assumes(j, kevent_mod((uintptr_t)&j->exit_timeout, EVFILT_TIMER, @@ -2150,7 +2147,7 @@ } if (j->sent_sigterm_time) { - uint64_t td_sec, td_usec, td = (mach_absolute_time() - j->sent_sigterm_time) * tbi.numer / tbi.denom; + uint64_t td_sec, td_usec, td = runtime_opaque_time_to_nano(runtime_get_opaque_time() - j->sent_sigterm_time); td_sec = td / NSEC_PER_SEC; td_usec = (td % NSEC_PER_SEC) / NSEC_PER_USEC; @@ -2432,7 +2429,7 @@ job_dispatch(j, false); } else if (&j->exit_timeout == ident) { if (j->sent_sigkill) { - uint64_t td = (mach_absolute_time() - j->sent_sigterm_time) * tbi.numer / tbi.denom; + uint64_t td = runtime_opaque_time_to_nano(runtime_get_opaque_time() - j->sent_sigterm_time); td /= NSEC_PER_SEC; td -= j->exit_timeout; @@ -2481,7 +2478,6 @@ void jobmgr_callback(void *obj, struct kevent *kev) { - struct timeval tvnow; jobmgr_t jm = obj; job_t ji; @@ -2504,8 +2500,11 @@ runtime_closelog(); /* HACK -- force 'start' time to be set */ - if (getpid() == 1 && jobmgr_assumes(jm, gettimeofday(&tvnow, NULL) != -1)) { - jobmgr_log(jm, LOG_NOTICE, "Anticipatory shutdown began at: %lu.%06u", tvnow.tv_sec, tvnow.tv_usec); + if (getpid() == 1) { + int64_t now = runtime_get_wall_time(); + + jobmgr_log(jm, LOG_NOTICE, "Anticipatory shutdown began at: %lld.%06llu", now / USEC_PER_SEC, now % USEC_PER_SEC); + LIST_FOREACH(ji, &root_jobmgr->jobs, sle) { if (ji->per_user && ji->p) { job_assumes(ji, runtime_kill(ji->p, SIGUSR2) != -1); @@ -2562,7 +2561,7 @@ void job_start(job_t j) { - uint64_t td, tnow = mach_absolute_time(); + uint64_t td, tnow = runtime_get_opaque_time(); int spair[2]; int execspair[2]; int oepair[2]; @@ -2584,10 +2583,10 @@ /* * 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. + * Therefore, launchd must use an absolute clock instead of the wall clock + * wherever possible. */ - td = (tnow - j->start_time) * tbi.numer / tbi.denom; + td = runtime_opaque_time_to_nano(tnow - j->start_time); td /= NSEC_PER_SEC; if (j->start_time && (td < j->min_run_time) && !j->legacy_mach_job && !j->inetcompat) { @@ -6737,13 +6736,6 @@ } void -do_file_init(void) -{ - launchd_assert(mach_timebase_info(&tbi) == 0); - -} - -void do_unmounts(void) { struct statfs buf[250]; Modified: trunk/launchd/src/launchd_runtime.c =================================================================== --- trunk/launchd/src/launchd_runtime.c 2007-12-19 18:13:19 UTC (rev 23470) +++ trunk/launchd/src/launchd_runtime.c 2007-12-19 19:48:57 UTC (rev 23471) @@ -33,6 +33,7 @@ #include <mach/mach_interface.h> #include <mach/host_info.h> #include <mach/mach_host.h> +#include <mach/mach_time.h> #include <mach/exception.h> #include <sys/types.h> #include <sys/stat.h> @@ -109,6 +110,8 @@ static bool logmsg_add(struct runtime_syslog_attr *attr, int err_num, const char *msg); static void logmsg_remove(struct logmsg_s *lm); +static void do_file_init(void) __attribute__((constructor)); +static mach_timebase_info_data_t tbi; static const int sigigns[] = { SIGHUP, SIGINT, SIGPIPE, SIGALRM, SIGTERM, SIGURG, SIGTSTP, SIGTSTP, SIGCONT, SIGTTIN, SIGTTOU, SIGIO, SIGXCPU, @@ -1209,7 +1212,7 @@ data_off = lm->data; - launchd_assumes(gettimeofday(&lm->when, NULL) != -1); + lm->when = runtime_get_wall_time(); lm->from_pid = attr->from_pid; lm->about_pid = attr->about_pid; lm->err_num = err_num; @@ -1307,8 +1310,7 @@ runtime_log_push(void) { static pthread_mutex_t ourlock = PTHREAD_MUTEX_INITIALIZER; - static struct timeval shutdown_start; - struct timeval tvd; + static int64_t shutdown_start, log_delta; mach_msg_type_number_t outvalCnt; struct logmsg_s *lm; vm_offset_t outval; @@ -1329,8 +1331,8 @@ return; } - if (shutdown_start.tv_sec == 0) { - gettimeofday(&shutdown_start, NULL); + if (shutdown_start == 0) { + shutdown_start = runtime_get_wall_time(); launchd_log_vm_stats(); } @@ -1349,15 +1351,9 @@ } while ((lm = STAILQ_FIRST(&logmsg_queue))) { - timersub(&lm->when, &shutdown_start, &tvd); + log_delta = lm->when - shutdown_start; - /* don't ask */ - if (tvd.tv_sec < 0) { - tvd.tv_sec = 0; - tvd.tv_usec = 0; - } - - fprintf(ourlogfile, "%3ld.%06d%6u %-40s%6u %-40s %s\n", tvd.tv_sec, tvd.tv_usec, + fprintf(ourlogfile, "%8lld%6u %-40s%6u %-40s %s\n", log_delta, lm->from_pid, lm->from_name, lm->about_pid, lm->about_name, lm->msg); logmsg_remove(lm); @@ -1550,3 +1546,55 @@ return (apple_internal_logging == 0); } + +int64_t +runtime_get_wall_time(void) +{ + struct timeval tv; + int64_t r; + + launchd_assumes(gettimeofday(&tv, NULL) != -1); + + r = tv.tv_sec; + r *= USEC_PER_SEC; + r += tv.tv_usec; + + return r; +} + +uint64_t +runtime_get_opaque_time(void) +{ + return mach_absolute_time(); +} + +uint64_t +runtime_opaque_time_to_nano(uint64_t o) +{ +#if defined(__i386__) + if (unlikely(tbi.numer != tbi.denom)) { +#elif defined(__ppc__) + if (likely(tbi.numer != tbi.denom)) { +#else + if (tbi.numer != tbi.denom) { +#endif + if (o < INT32_MAX) { + o *= tbi.numer; + o /= tbi.denom; + } else { + double d = o; + d *= tbi.numer; + d /= tbi.denom; + o = d; + } + } + + return o; +} + +void +do_file_init(void) +{ + launchd_assert(mach_timebase_info(&tbi) == 0); +} + Modified: trunk/launchd/src/launchd_runtime.h =================================================================== --- trunk/launchd/src/launchd_runtime.h 2007-12-19 18:13:19 UTC (rev 23470) +++ trunk/launchd/src/launchd_runtime.h 2007-12-19 19:48:57 UTC (rev 23471) @@ -70,6 +70,8 @@ #endif +#define likely(x) __builtin_expect((bool)(x), true) +#define unlikely(x) __builtin_expect((bool)(x), false) struct ldcred { uid_t euid; @@ -151,7 +153,11 @@ void runtime_vsyslog(struct runtime_syslog_attr *attr, const char *message, va_list args) __attribute__((format(printf, 2, 0))); void runtime_log_push(void); +int64_t runtime_get_wall_time(void); +uint64_t runtime_get_opaque_time(void); +uint64_t runtime_opaque_time_to_nano(uint64_t o); + kern_return_t launchd_set_bport(mach_port_t name); kern_return_t launchd_get_bport(mach_port_t *name); kern_return_t launchd_mport_notify_req(mach_port_t name, mach_msg_id_t which); Modified: trunk/launchd/src/libvproc_internal.h =================================================================== --- trunk/launchd/src/libvproc_internal.h 2007-12-19 18:13:19 UTC (rev 23470) +++ trunk/launchd/src/libvproc_internal.h 2007-12-19 19:48:57 UTC (rev 23471) @@ -59,7 +59,7 @@ struct logmsg_s { STAILQ_ENTRY(logmsg_s) sqe; - struct timeval when; + int64_t when; pid_t from_pid; pid_t about_pid; uid_t sender_uid;

1 0

[23470] trunk/launchd/src
by source_changes＠macosforge.org 19 Dec '07

19 Dec '07

Revision: 23470 http://trac.macosforge.org/projects/launchd/changeset/23470 Author: zarzycki(a)apple.com Date: 2007-12-19 10:13:19 -0800 (Wed, 19 Dec 2007) Log Message: ----------- Better shutdown logging. Modified Paths: -------------- trunk/launchd/src/launchd.c trunk/launchd/src/launchd.h trunk/launchd/src/launchd_core_logic.c trunk/launchd/src/launchd_runtime.c trunk/launchd/src/launchd_runtime.h Modified: trunk/launchd/src/launchd.c =================================================================== --- trunk/launchd/src/launchd.c 2007-12-19 17:40:56 UTC (rev 23469) +++ trunk/launchd/src/launchd.c 2007-12-19 18:13:19 UTC (rev 23470) @@ -95,12 +95,13 @@ static void handle_pid1_crashes_separately(void); static void prep_shutdown_log_dir(void); -static bool re_exec_in_single_user_mode = false; +static bool re_exec_in_single_user_mode; static void *crash_addr; static pid_t crash_pid; -bool shutdown_in_progress = false; -bool network_up = false; +bool shutdown_in_progress; +bool fake_shutdown_in_progress; +bool network_up; int main(int argc, char *const *argv) @@ -261,12 +262,12 @@ prep_shutdown_log_dir(); } + runtime_log_push(); + if (launchd_assumes(gettimeofday(&tvnow, NULL) != -1)) { runtime_syslog(LOG_NOTICE, "Shutdown began at: %lu.%06u", tvnow.tv_sec, tvnow.tv_usec); } - launchd_log_vm_stats(); - launchd_assert(jobmgr_shutdown(root_jobmgr) != NULL); } Modified: trunk/launchd/src/launchd.h =================================================================== --- trunk/launchd/src/launchd.h 2007-12-19 17:40:56 UTC (rev 23469) +++ trunk/launchd/src/launchd.h 2007-12-19 18:13:19 UTC (rev 23470) @@ -32,6 +32,7 @@ struct conncb; extern bool shutdown_in_progress; +extern bool fake_shutdown_in_progress; extern bool network_up; bool init_check_pid(pid_t); Modified: trunk/launchd/src/launchd_core_logic.c =================================================================== --- trunk/launchd/src/launchd_core_logic.c 2007-12-19 17:40:56 UTC (rev 23469) +++ trunk/launchd/src/launchd_core_logic.c 2007-12-19 18:13:19 UTC (rev 23470) @@ -2481,7 +2481,9 @@ void jobmgr_callback(void *obj, struct kevent *kev) { + struct timeval tvnow; jobmgr_t jm = obj; + job_t ji; switch (kev->filter) { case EVFILT_PROC: @@ -2496,6 +2498,24 @@ return launchd_shutdown(); case SIGUSR1: return calendarinterval_callback(); + case SIGUSR2: + fake_shutdown_in_progress = true; + runtime_setlogmask(LOG_UPTO(LOG_DEBUG)); + + runtime_closelog(); /* HACK -- force 'start' time to be set */ + + if (getpid() == 1 && jobmgr_assumes(jm, gettimeofday(&tvnow, NULL) != -1)) { + jobmgr_log(jm, LOG_NOTICE, "Anticipatory shutdown began at: %lu.%06u", tvnow.tv_sec, tvnow.tv_usec); + LIST_FOREACH(ji, &root_jobmgr->jobs, sle) { + if (ji->per_user && ji->p) { + job_assumes(ji, runtime_kill(ji->p, SIGUSR2) != -1); + } + } + } else { + jobmgr_log(jm, LOG_NOTICE, "Anticipatory per-user launchd shutdown"); + } + + return; default: return (void)jobmgr_assumes(jm, false); } @@ -4453,6 +4473,7 @@ if (!jm) { jobmgr_assumes(jmr, kevent_mod(SIGTERM, EVFILT_SIGNAL, EV_ADD, 0, 0, jmr) != -1); jobmgr_assumes(jmr, kevent_mod(SIGUSR1, EVFILT_SIGNAL, EV_ADD, 0, 0, jmr) != -1); + jobmgr_assumes(jmr, kevent_mod(SIGUSR2, EVFILT_SIGNAL, EV_ADD, 0, 0, jmr) != -1); jobmgr_assumes(jmr, kevent_mod(0, EVFILT_FS, EV_ADD, VQ_MOUNT|VQ_UNMOUNT|VQ_UPDATE, 0, jmr) != -1); } @@ -5749,7 +5770,6 @@ kern_return_t job_mig_check_in(job_t j, name_t servicename, mach_port_t *serviceportp) { - static pid_t last_warned_pid = 0; struct machservice *ms; struct ldcred ldc; job_t jo; @@ -5768,11 +5788,14 @@ } if ((jo = machservice_job(ms)) != j) { + static pid_t last_warned_pid; + if (last_warned_pid != ldc.pid) { job_log(j, LOG_NOTICE, "Check-in of Mach service failed. The service \"%s\" is owned by: %s", servicename, jo->label); last_warned_pid = ldc.pid; } - return BOOTSTRAP_NOT_PRIVILEGED; + + return BOOTSTRAP_NOT_PRIVILEGED; } if (machservice_active(ms)) { job_log(j, LOG_WARNING, "Check-in of Mach service failed. Already active: %s", servicename); Modified: trunk/launchd/src/launchd_runtime.c =================================================================== --- trunk/launchd/src/launchd_runtime.c 2007-12-19 17:40:56 UTC (rev 23469) +++ trunk/launchd/src/launchd_runtime.c 2007-12-19 18:13:19 UTC (rev 23470) @@ -105,7 +105,6 @@ static mach_port_t drain_reply_port; static void runtime_log_uncork_pending_drain(void); static kern_return_t runtime_log_pack(vm_offset_t *outval, mach_msg_type_number_t *outvalCnt); -static void runtime_log_push(void); static bool logmsg_add(struct runtime_syslog_attr *attr, int err_num, const char *msg); static void logmsg_remove(struct logmsg_s *lm); @@ -116,7 +115,9 @@ SIGXFSZ, SIGVTALRM, SIGPROF, SIGWINCH, SIGINFO, SIGUSR1, SIGUSR2 }; static sigset_t sigign_set; +static FILE *ourlogfile; + mach_port_t runtime_get_kernel_port(void) { @@ -1117,11 +1118,11 @@ return close(fd); } -static FILE *ourlogfile; - void runtime_closelog(void) { + runtime_log_push(); + if (ourlogfile) { launchd_assumes(fflush(ourlogfile) == 0); launchd_assumes(runtime_fsync(fileno(ourlogfile)) != -1); @@ -1131,11 +1132,15 @@ int runtime_fsync(int fd) { +#if 0 if (do_apple_internal_logging()) { return fcntl(fd, F_FULLFSYNC, NULL); } else { return fsync(fd); } +#else + return fsync(fd); +#endif } int @@ -1166,13 +1171,8 @@ void runtime_vsyslog(struct runtime_syslog_attr *attr, const char *message, va_list args) { - static pthread_mutex_t ourlock = PTHREAD_MUTEX_INITIALIZER; - static struct timeval shutdown_start; - static struct timeval prev_msg; - struct timeval tvnow, tvd_total, tvd_msg_delta = { 0, 0 }; int saved_errno = errno; char newmsg[10000]; - size_t i, j; if (attr->priority == LOG_APPLEONLY) { if (do_apple_internal_logging()) { @@ -1186,70 +1186,11 @@ return; } - if (getpid() != 1 || !shutdown_in_progress) { - vsnprintf(newmsg, sizeof(newmsg), message, args); - logmsg_add(attr, saved_errno, newmsg); - return; - } - - if (shutdown_start.tv_sec == 0) { - gettimeofday(&shutdown_start, NULL); - } - - if (gettimeofday(&tvnow, NULL) == -1) { - tvnow.tv_sec = 0; - tvnow.tv_usec = 0; - } - - pthread_mutex_lock(&ourlock); - - if (ourlogfile == NULL) { - rename("/var/log/launchd-shutdown.log", "/var/log/launchd-shutdown.log.1"); - ourlogfile = fopen("/var/log/launchd-shutdown.log", "a"); - } - - pthread_mutex_unlock(&ourlock); - - if (ourlogfile == NULL) { - return; - } - - if (message == NULL) { - return; - } - - timersub(&tvnow, &shutdown_start, &tvd_total); - - if (prev_msg.tv_sec != 0) { - timersub(&tvnow, &prev_msg, &tvd_msg_delta); - } - - prev_msg = tvnow; - - snprintf(newmsg, sizeof(newmsg), "%3ld.%06d%4ld.%06d%6u %-40s%6u %-40s ", - tvd_total.tv_sec, tvd_total.tv_usec, - tvd_msg_delta.tv_sec, tvd_msg_delta.tv_usec, - attr->from_pid, attr->from_name, - attr->about_pid, attr->about_name); - - for (i = 0, j = strlen(newmsg); message[i];) { - if (message[i] == '%' && message[i + 1] == 'm') { - char *errs = strerror(saved_errno); - strcpy(newmsg + j, errs ? errs : "unknown error"); - j += strlen(newmsg + j); - i += 2; - } else { - newmsg[j] = message[i]; - j++; - i++; - } - } - - strcpy(newmsg + j, "\n"); - - vfprintf(ourlogfile, newmsg, args); + vsnprintf(newmsg, sizeof(newmsg), message, args); + logmsg_add(attr, saved_errno, newmsg); } + bool logmsg_add(struct runtime_syslog_attr *attr, int err_num, const char *msg) { @@ -1365,24 +1306,62 @@ void runtime_log_push(void) { + static pthread_mutex_t ourlock = PTHREAD_MUTEX_INITIALIZER; + static struct timeval shutdown_start; + struct timeval tvd; mach_msg_type_number_t outvalCnt; + struct logmsg_s *lm; vm_offset_t outval; if (logmsg_queue_cnt == 0) { launchd_assumes(STAILQ_EMPTY(&logmsg_queue)); return; - } else if (getpid() == 1) { + } else if (getpid() != 1) { + if (runtime_log_pack(&outval, &outvalCnt) == 0) { + launchd_assumes(_vprocmgr_log_forward(inherited_bootstrap_port, (void *)outval, outvalCnt) == NULL); + mig_deallocate(outval, outvalCnt); + } + return; + } + + if (!shutdown_in_progress && !fake_shutdown_in_progress) { runtime_log_uncork_pending_drain(); return; } - if (runtime_log_pack(&outval, &outvalCnt) != 0) { + if (shutdown_start.tv_sec == 0) { + gettimeofday(&shutdown_start, NULL); + launchd_log_vm_stats(); + } + + + pthread_mutex_lock(&ourlock); + + if (ourlogfile == NULL) { + rename("/var/log/launchd-shutdown.log", "/var/log/launchd-shutdown.log.1"); + ourlogfile = fopen("/var/log/launchd-shutdown.log", "a"); + } + + pthread_mutex_unlock(&ourlock); + + if (!ourlogfile) { return; } - launchd_assumes(_vprocmgr_log_forward(inherited_bootstrap_port, (void *)outval, outvalCnt) == NULL); + while ((lm = STAILQ_FIRST(&logmsg_queue))) { + timersub(&lm->when, &shutdown_start, &tvd); - mig_deallocate(outval, outvalCnt); + /* don't ask */ + if (tvd.tv_sec < 0) { + tvd.tv_sec = 0; + tvd.tv_usec = 0; + } + + fprintf(ourlogfile, "%3ld.%06d%6u %-40s%6u %-40s %s\n", tvd.tv_sec, tvd.tv_usec, + lm->from_pid, lm->from_name, lm->about_pid, lm->about_name, lm->msg); + + logmsg_remove(lm); + } } kern_return_t @@ -1424,10 +1403,9 @@ kern_return_t runtime_log_drain(mach_port_t srp, vm_offset_t *outval, mach_msg_type_number_t *outvalCnt) { - if (logmsg_queue_cnt == 0) { - launchd_assumes(STAILQ_EMPTY(&logmsg_queue)); - launchd_assumes(drain_reply_port == 0); + launchd_assumes(drain_reply_port == 0); + if ((logmsg_queue_cnt == 0) || shutdown_in_progress || fake_shutdown_in_progress) { drain_reply_port = srp; launchd_assumes(launchd_mport_notify_req(drain_reply_port, MACH_NOTIFY_DEAD_NAME) == KERN_SUCCESS); Modified: trunk/launchd/src/launchd_runtime.h =================================================================== --- trunk/launchd/src/launchd_runtime.h 2007-12-19 17:40:56 UTC (rev 23469) +++ trunk/launchd/src/launchd_runtime.h 2007-12-19 18:13:19 UTC (rev 23470) @@ -149,6 +149,7 @@ void runtime_closelog(void); void runtime_syslog(int pri, const char *message, ...) __attribute__((format(printf, 2, 3))); void runtime_vsyslog(struct runtime_syslog_attr *attr, const char *message, va_list args) __attribute__((format(printf, 2, 0))); +void runtime_log_push(void); kern_return_t launchd_set_bport(mach_port_t name);

1 0

[23469] trunk/launchd/src
by source_changes＠macosforge.org 19 Dec '07

19 Dec '07

Revision: 23469 http://trac.macosforge.org/projects/launchd/changeset/23469 Author: zarzycki(a)apple.com Date: 2007-12-19 09:40:56 -0800 (Wed, 19 Dec 2007) Log Message: ----------- <rdar://problem/5582235> printf output not appearing in console or appearing after app quits Modified Paths: -------------- trunk/launchd/src/launchd_core_logic.c trunk/launchd/src/launchd_runtime.c Modified: trunk/launchd/src/launchd_core_logic.c =================================================================== --- trunk/launchd/src/launchd_core_logic.c 2007-12-19 17:33:08 UTC (rev 23468) +++ trunk/launchd/src/launchd_core_logic.c 2007-12-19 17:40:56 UTC (rev 23469) @@ -2084,8 +2084,12 @@ } if (j->log_redirect_fd && !j->legacy_LS_job) { - job_assumes(j, runtime_close(j->log_redirect_fd) != -1); - j->log_redirect_fd = 0; + job_log_stdouterr(j); /* one last chance */ + + if (j->log_redirect_fd) { + job_assumes(j, runtime_close(j->log_redirect_fd) != -1); + j->log_redirect_fd = 0; + } } if (j->forkfd) { Modified: trunk/launchd/src/launchd_runtime.c =================================================================== --- trunk/launchd/src/launchd_runtime.c 2007-12-19 17:33:08 UTC (rev 23468) +++ trunk/launchd/src/launchd_runtime.c 2007-12-19 17:40:56 UTC (rev 23469) @@ -1183,13 +1183,13 @@ } if (!(LOG_MASK(attr->priority) & internal_mask_pri)) { - goto out; + return; } if (getpid() != 1 || !shutdown_in_progress) { vsnprintf(newmsg, sizeof(newmsg), message, args); logmsg_add(attr, saved_errno, newmsg); - goto out; + return; } if (shutdown_start.tv_sec == 0) { @@ -1211,11 +1211,11 @@ pthread_mutex_unlock(&ourlock); if (ourlogfile == NULL) { - goto out; + return; } if (message == NULL) { - goto out; + return; } timersub(&tvnow, &shutdown_start, &tvd_total); @@ -1248,9 +1248,6 @@ strcpy(newmsg + j, "\n"); vfprintf(ourlogfile, newmsg, args); - -out: - runtime_log_uncork_pending_drain(); } bool @@ -1375,6 +1372,7 @@ launchd_assumes(STAILQ_EMPTY(&logmsg_queue)); return; } else if (getpid() == 1) { + runtime_log_uncork_pending_drain(); return; }

1 0

[23468] trunk/launchd/src/launchd_core_logic.c
by source_changes＠macosforge.org 19 Dec '07

19 Dec '07

Revision: 23468 http://trac.macosforge.org/projects/launchd/changeset/23468 Author: zarzycki(a)apple.com Date: 2007-12-19 09:33:08 -0800 (Wed, 19 Dec 2007) Log Message: ----------- More missing bits. 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-12-13 20:35:48 UTC (rev 23467) +++ trunk/launchd/src/launchd_core_logic.c 2007-12-19 17:33:08 UTC (rev 23468) @@ -798,6 +798,17 @@ ipc_close_all_with_job(j); +#if DO_RUSAGE_SUMMATION + job_log(j, LOG_INFO, "Total rusage: utime %ld.%06u stime %ld.%06u maxrss %lu ixrss %lu idrss %lu isrss %lu minflt %lu majflt %lu nswap %lu inblock %lu oublock %lu msgsnd %lu msgrcv %lu nsignals %lu nvcsw %lu nivcsw %lu", + j->ru.ru_utime.tv_sec, j->ru.ru_utime.tv_usec, + j->ru.ru_stime.tv_sec, j->ru.ru_stime.tv_usec, + j->ru.ru_maxrss, j->ru.ru_ixrss, j->ru.ru_idrss, j->ru.ru_isrss, + j->ru.ru_minflt, j->ru.ru_majflt, + j->ru.ru_nswap, j->ru.ru_inblock, j->ru.ru_oublock, + j->ru.ru_msgsnd, j->ru.ru_msgrcv, + j->ru.ru_nsignals, j->ru.ru_nvcsw, j->ru.ru_nivcsw); +#endif + if (j->forced_peers_to_demand_mode) { job_set_global_on_demand(j, false); }

1 0

[23467] trunk/launchd/src/launchd_core_logic.c
by source_changes＠macosforge.org 13 Dec '07

13 Dec '07

Revision: 23467 http://trac.macosforge.org/projects/launchd/changeset/23467 Author: zarzycki(a)apple.com Date: 2007-12-13 12:35:48 -0800 (Thu, 13 Dec 2007) Log Message: ----------- Fix a think-o. 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-12-13 00:16:27 UTC (rev 23466) +++ trunk/launchd/src/launchd_core_logic.c 2007-12-13 20:35:48 UTC (rev 23467) @@ -5737,6 +5737,7 @@ static pid_t last_warned_pid = 0; struct machservice *ms; struct ldcred ldc; + job_t jo; if (!launchd_assumes(j != NULL)) { return BOOTSTRAP_NO_MEMORY; @@ -5750,9 +5751,10 @@ job_log(j, LOG_DEBUG, "Check-in of Mach service failed. Unknown: %s", servicename); return BOOTSTRAP_UNKNOWN_SERVICE; } - if (machservice_job(ms) != j) { + + if ((jo = machservice_job(ms)) != j) { if (last_warned_pid != ldc.pid) { - job_log(j, LOG_NOTICE, "Check-in of Mach service failed. The service \"%s\" is owned by: %s", servicename, j->label); + job_log(j, LOG_NOTICE, "Check-in of Mach service failed. The service \"%s\" is owned by: %s", servicename, jo->label); last_warned_pid = ldc.pid; } return BOOTSTRAP_NOT_PRIVILEGED;

1 0