October 2006 - launchd-changes - lists.macosforge.org

[22928] tags/launchd-167/
by source_changes＠macosforge.org 31 Oct '06

31 Oct '06

Revision: 22928 http://trac.macosforge.org/projects/launchd/changeset/22928 Author: zarzycki(a)apple.com Date: 2006-10-31 14:00:53 -0800 (Tue, 31 Oct 2006) Log Message: ----------- "Tagging launchd-167 from https://svn.macosforge.org/repository/launchd/trunk" Added Paths: ----------- tags/launchd-167/ Copied: tags/launchd-167 (from rev 22927, trunk)

1 0

[22927] trunk/launchd/src/launchctl.c
by source_changes＠macosforge.org 31 Oct '06

31 Oct '06

Revision: 22927 http://trac.macosforge.org/projects/launchd/changeset/22927 Author: zarzycki(a)apple.com Date: 2006-10-30 16:11:51 -0800 (Mon, 30 Oct 2006) Log Message: ----------- <rdar://problem/4809882> do not load the Firewall tool during startup Modified Paths: -------------- trunk/launchd/src/launchctl.c Modified: trunk/launchd/src/launchctl.c =================================================================== --- trunk/launchd/src/launchctl.c 2006-10-30 16:16:10 UTC (rev 22926) +++ trunk/launchd/src/launchctl.c 2006-10-31 00:11:51 UTC (rev 22927) @@ -1233,11 +1233,6 @@ assumes(fwexec(audit_tool, true) != -1); } - if (path_check("/Library/Preferences/com.apple.sharing.firewall.plist")) { - const char *fw_tool[] = { "/usr/libexec/FirewallTool", NULL }; - assumes(fwexec(fw_tool, true) != -1); - } - const char *bcc_tool[] = { "BootCacheControl", "start", NULL }; assumes(fwexec(bcc_tool, true) != -1);

1 0

[22926] trunk/launchd/src/launchctl.c
by source_changes＠macosforge.org 30 Oct '06

30 Oct '06

Revision: 22926 http://trac.macosforge.org/projects/launchd/changeset/22926 Author: zarzycki(a)apple.com Date: 2006-10-30 08:16:10 -0800 (Mon, 30 Oct 2006) Log Message: ----------- Just an experiment. The code is disabled for now... Modified Paths: -------------- trunk/launchd/src/launchctl.c Modified: trunk/launchd/src/launchctl.c =================================================================== --- trunk/launchd/src/launchctl.c 2006-10-27 17:52:50 UTC (rev 22925) +++ trunk/launchd/src/launchctl.c 2006-10-30 16:16:10 UTC (rev 22926) @@ -132,6 +132,7 @@ static void do_sysversion_sysctl(void); static void workaround4465949(void); static void do_application_firewall_magic(int sfd, launch_data_t thejob); +static void preheat_page_cache_hack(void); static int bootstrap_cmd(int argc, char *const argv[]); static int load_and_unload_cmd(int argc, char *const argv[]); @@ -1240,6 +1241,8 @@ const char *bcc_tool[] = { "BootCacheControl", "start", NULL }; assumes(fwexec(bcc_tool, true) != -1); + preheat_page_cache_hack(); + char *load_launchd_items[] = { "load", "-D", "all", "/etc/mach_init.d", NULL }; if (is_safeboot()) load_launchd_items[2] = "system"; @@ -2724,3 +2727,43 @@ assumes(setsockopt(sfd, SOL_SOCKET, SO_EXECPATH, prog, strlen(prog) + 1) != -1); } } + + +void +preheat_page_cache_hack(void) +{ + struct dirent *de; + DIR *thedir; + + /* Disable this hack for now */ + return; + + if ((thedir = opendir("/etc/preheat_at_boot")) == NULL) { + return; + } + + while ((de = readdir(thedir))) { + struct stat sb; + void *junkbuf; + int fd; + + if (de->d_name[0] == '.') { + continue; + } + + if ((fd = open(de->d_name, O_RDONLY)) == -1) { + continue; + } + + if (fstat(fd, &sb) != -1) { + if ((junkbuf = malloc(sb.st_size)) != NULL) { + assumes(read(fd, junkbuf, sb.st_size) == sb.st_size); + free(junkbuf); + } + } + + close(fd); + } + + closedir(thedir); +}

1 0

[22925] trunk/launchd/src/launchd_core_logic.c
by source_changes＠macosforge.org 27 Oct '06

27 Oct '06

Revision: 22925 http://trac.macosforge.org/projects/launchd/changeset/22925 Author: zarzycki(a)apple.com Date: 2006-10-27 10:52:50 -0700 (Fri, 27 Oct 2006) Log Message: ----------- Since Mach service lookups are O(n) right now, let's keep the popular (MRU) services at the head of the list. Modified Paths: -------------- trunk/launchd/src/launchd_core_logic.c Modified: trunk/launchd/src/launchd_core_logic.c =================================================================== --- trunk/launchd/src/launchd_core_logic.c 2006-10-26 21:50:06 UTC (rev 22924) +++ trunk/launchd/src/launchd_core_logic.c 2006-10-27 17:52:50 UTC (rev 22925) @@ -3040,6 +3040,10 @@ SLIST_FOREACH(ms, &ji->machservices, sle) { if (strcmp(name, ms->name) == 0) { + if (ji->parent) { + SLIST_REMOVE(&ji->parent->jobs, ji, job_s, sle); + SLIST_INSERT_HEAD(&ji->parent->jobs, ji, sle); + } return ms; } }

1 0

[22924] tags/launchd-166/
by source_changes＠macosforge.org 26 Oct '06

26 Oct '06

Revision: 22924 http://trac.macosforge.org/projects/launchd/changeset/22924 Author: zarzycki(a)apple.com Date: 2006-10-26 14:50:06 -0700 (Thu, 26 Oct 2006) Log Message: ----------- "Tagging launchd-166 from https://svn.macosforge.org/repository/launchd/trunk" Added Paths: ----------- tags/launchd-166/ Copied: tags/launchd-166 (from rev 22923, trunk)

1 0

[22923] trunk/launchd/src/launchd_core_logic.c
by source_changes＠macosforge.org 26 Oct '06

26 Oct '06

Revision: 22923 http://trac.macosforge.org/projects/launchd/changeset/22923 Author: zarzycki(a)apple.com Date: 2006-10-26 11:57:29 -0700 (Thu, 26 Oct 2006) Log Message: ----------- Let's not pay the getpwuid() hit unless we have to... Modified Paths: -------------- trunk/launchd/src/launchd_core_logic.c Modified: trunk/launchd/src/launchd_core_logic.c =================================================================== --- trunk/launchd/src/launchd_core_logic.c 2006-10-26 18:56:25 UTC (rev 22922) +++ trunk/launchd/src/launchd_core_logic.c 2006-10-26 18:57:29 UTC (rev 22923) @@ -4054,7 +4054,9 @@ return BOOTSTRAP_NO_MEMORY; } - jr->mach_uid = ldc.uid; + if (getuid() == 0) { + jr->mach_uid = ldc.uid; + } if (!job_setup_machport(jr)) { job_remove(jr);

1 0

[22922] trunk/launchd/src/libvproc.c
by source_changes＠macosforge.org 26 Oct '06

26 Oct '06

Revision: 22922 http://trac.macosforge.org/projects/launchd/changeset/22922 Author: zarzycki(a)apple.com Date: 2006-10-26 11:56:25 -0700 (Thu, 26 Oct 2006) Log Message: ----------- <rdar://problem/4804995> Workaround 4802454 for now by stubbing out the API Modified Paths: -------------- trunk/launchd/src/libvproc.c Modified: trunk/launchd/src/libvproc.c =================================================================== --- trunk/launchd/src/libvproc.c 2006-10-26 18:42:00 UTC (rev 22921) +++ trunk/launchd/src/libvproc.c 2006-10-26 18:56:25 UTC (rev 22922) @@ -134,11 +134,22 @@ return -1; } +#if 0 kern_return_t -mpm_wait(mach_port_t ajob, int *wstatus) +mpm_wait(mach_port_t ajob __attribute__((unused)), int *wstatus) { + /* Stubbed out for now... + * <rdar://problem/4802454> CAS: WindowServer hangs in CGXProcessHIDEvent/.../CGXPseudoActivateWindow/.../_LSDoSetFrontProcess + */ return vproc_mig_wait(ajob, wstatus); } +#else +kern_return_t +mpm_wait(mach_port_t ajob __attribute__((unused)), int *wstatus __attribute__((unused))) +{ + return MIG_BAD_ID; +} +#endif kern_return_t mpm_uncork_fork(mach_port_t ajob)

1 0

[22921] trunk/launchd/src/launchd_core_logic.c
by source_changes＠macosforge.org 26 Oct '06

26 Oct '06

Revision: 22921 http://trac.macosforge.org/projects/launchd/changeset/22921 Author: zarzycki(a)apple.com Date: 2006-10-26 11:42:00 -0700 (Thu, 26 Oct 2006) Log Message: ----------- <rdar://problem/4801667> Applications 'open'ed in 'ssh' session belong to 'root' Modified Paths: -------------- trunk/launchd/src/launchd_core_logic.c Modified: trunk/launchd/src/launchd_core_logic.c =================================================================== --- trunk/launchd/src/launchd_core_logic.c 2006-10-26 18:00:55 UTC (rev 22920) +++ trunk/launchd/src/launchd_core_logic.c 2006-10-26 18:42:00 UTC (rev 22921) @@ -4054,6 +4054,8 @@ return BOOTSTRAP_NO_MEMORY; } + jr->mach_uid = ldc.uid; + if (!job_setup_machport(jr)) { job_remove(jr); return BOOTSTRAP_NO_MEMORY;

1 0

[22920] trunk/launchd/src
by source_changes＠macosforge.org 26 Oct '06

26 Oct '06

Revision: 22920 http://trac.macosforge.org/projects/launchd/changeset/22920 Author: zarzycki(a)apple.com Date: 2006-10-26 11:00:55 -0700 (Thu, 26 Oct 2006) Log Message: ----------- It was always dubious that job_log*() could be called on the child side of the fork() but before the exec*(). This provides a cleaner solution that is less likely to confuse launchd itself or any logging API it uses (syslog or asl_log). As a side effect, jobs _could_ now log indirectly via launchd, but I'm not sure we'll make that public API yet... Maybe someday when we have a somewhat more compelling story over syslog() or asl_log(), but that day isn't today, nor do I intend to put much effort to acheiving that goal in the foreseeable future. Modified Paths: -------------- trunk/launchd/src/launchd_core_logic.c trunk/launchd/src/libvproc.c trunk/launchd/src/libvproc_internal.h Modified: trunk/launchd/src/launchd_core_logic.c =================================================================== --- trunk/launchd/src/launchd_core_logic.c 2006-10-26 01:18:08 UTC (rev 22919) +++ trunk/launchd/src/launchd_core_logic.c 2006-10-26 18:00:55 UTC (rev 22920) @@ -283,7 +283,7 @@ static void job_uncork_fork(job_t j); static struct machservice *job_lookup_service(job_t jbs, const char *name, bool check_parent); static void job_foreach_service(job_t jbs, void (*bs_iter)(struct machservice *, void *), void *context, bool only_anonymous); -static void job_logv(job_t j, int pri, const char *msg, va_list ap); +static void job_logv(job_t j, int pri, int err, const char *msg, va_list ap); static void job_log(job_t j, int pri, const char *msg, ...) __attribute__((format(printf, 3, 4))); static void job_log_error(job_t j, int pri, const char *msg, ...) __attribute__((format(printf, 3, 4))); static void job_log_bug(job_t j, const char *rcs_rev, const char *path, unsigned int line, const char *test); @@ -2115,15 +2115,28 @@ } void -job_logv(job_t j, int pri, const char *msg, va_list ap) +job_logv(job_t j, int pri, int err, const char *msg, va_list ap) { char newmsg[10000]; int oldmask = 0; size_t o; + /* + * Hack: If bootstrap_port is set, we must be on the child side of a + * fork(), but before the exec*(). Let's route the log message back to + * launchd proper. + */ + if (bootstrap_port) { + return _vproc_logv(pri, err, msg, ap); + } + o = job_prep_log_preface(j, newmsg); - sprintf(newmsg + o, ": %s", msg); + if (err) { + sprintf(newmsg + o, ": %s: %s", msg, strerror(err)); + } else { + sprintf(newmsg + o, ": %s", msg); + } if (j->debug) { oldmask = setlogmask(LOG_UPTO(LOG_DEBUG)); @@ -2139,13 +2152,10 @@ void job_log_error(job_t j, int pri, const char *msg, ...) { - char newmsg[10000]; va_list ap; - sprintf(newmsg, "%s: %s", msg, strerror(errno)); - va_start(ap, msg); - job_logv(j, pri, newmsg, ap); + job_logv(j, pri, errno, msg, ap); va_end(ap); } @@ -2155,7 +2165,7 @@ va_list ap; va_start(ap, msg); - job_logv(j, pri, msg, ap); + job_logv(j, pri, 0, msg, ap); va_end(ap); } Modified: trunk/launchd/src/libvproc.c =================================================================== --- trunk/launchd/src/libvproc.c 2006-10-26 01:18:08 UTC (rev 22919) +++ trunk/launchd/src/libvproc.c 2006-10-26 18:00:55 UTC (rev 22920) @@ -177,7 +177,7 @@ return (vproc_err_t)_vproc_set_global_on_demand; } -static void +void _vproc_logv(int pri, int err, const char *msg, va_list ap) { char flat_msg[3000]; Modified: trunk/launchd/src/libvproc_internal.h =================================================================== --- trunk/launchd/src/libvproc_internal.h 2006-10-26 01:18:08 UTC (rev 22919) +++ trunk/launchd/src/libvproc_internal.h 2006-10-26 18:00:55 UTC (rev 22920) @@ -21,6 +21,7 @@ */ #include <mach/mach.h> +#include <stdarg.h> #include "libbootstrap_public.h" typedef char * _internal_string_t; @@ -51,7 +52,9 @@ kern_return_t _vprocmgr_getsocket(mach_port_t bp, name_t); +void _vproc_logv(int pri, int err, const char *msg, va_list ap); + kern_return_t bootstrap_look_up_array( mach_port_t bp,

1 0

[22919] trunk/launchd/src
by source_changes＠macosforge.org 26 Oct '06

26 Oct '06

Revision: 22919 http://trac.macosforge.org/projects/launchd/changeset/22919 Author: zarzycki(a)apple.com Date: 2006-10-25 18:18:08 -0700 (Wed, 25 Oct 2006) Log Message: ----------- Make the internal logging code accessible to jobs as private API. Modified Paths: -------------- trunk/launchd/src/launchd_core_logic.c trunk/launchd/src/launchd_mig_types.defs trunk/launchd/src/libvproc.c trunk/launchd/src/libvproc_internal.h trunk/launchd/src/libvproc_private.h trunk/launchd/src/protocol_job.defs Modified: trunk/launchd/src/launchd_core_logic.c =================================================================== --- trunk/launchd/src/launchd_core_logic.c 2006-10-25 16:36:57 UTC (rev 22918) +++ trunk/launchd/src/launchd_core_logic.c 2006-10-26 01:18:08 UTC (rev 22919) @@ -3622,6 +3622,18 @@ } kern_return_t +job_mig_log(job_t j, int pri, int err, logmsg_t msg) +{ + if ((errno = err)) { + job_log_error(j, pri, "%s", msg); + } else { + job_log(j, pri, "%s", msg); + } + + return 0; +} + +kern_return_t job_mig_check_in(job_t j, name_t servicename, mach_port_t *serviceportp) { static pid_t last_warned_pid = 0; Modified: trunk/launchd/src/launchd_mig_types.defs =================================================================== --- trunk/launchd/src/launchd_mig_types.defs 2006-10-25 16:36:57 UTC (rev 22918) +++ trunk/launchd/src/launchd_mig_types.defs 2006-10-26 01:18:08 UTC (rev 22919) @@ -25,6 +25,7 @@ type pid_t = integer_t; type get_set_int_key_t = integer_t; +type logmsg_t = c_string[*:2048]; type cmd_t = c_string[512]; type cmd_array_t = ^array [] of cmd_t; type name_t = c_string[128]; Modified: trunk/launchd/src/libvproc.c =================================================================== --- trunk/launchd/src/libvproc.c 2006-10-25 16:36:57 UTC (rev 22918) +++ trunk/launchd/src/libvproc.c 2006-10-26 01:18:08 UTC (rev 22919) @@ -27,6 +27,7 @@ #include <mach/vm_map.h> #include <sys/param.h> #include <stdlib.h> +#include <stdio.h> #include <errno.h> #include "liblaunch_public.h" @@ -175,3 +176,34 @@ return (vproc_err_t)_vproc_set_global_on_demand; } + +static void +_vproc_logv(int pri, int err, const char *msg, va_list ap) +{ + char flat_msg[3000]; + + snprintf(flat_msg, sizeof(flat_msg) - 1, msg, ap); + flat_msg[sizeof(flat_msg) - 1] = '\0'; + + vproc_mig_log(bootstrap_port, pri, err, flat_msg); +} + +void +_vproc_log(int pri, const char *msg, ...) +{ + va_list ap; + + va_start(ap, msg); + _vproc_logv(pri, 0, msg, ap); + va_end(ap); +} + +void +_vproc_log_error(int pri, const char *msg, ...) +{ + va_list ap; + + va_start(ap, msg); + _vproc_logv(pri, errno, msg, ap); + va_end(ap); +} Modified: trunk/launchd/src/libvproc_internal.h =================================================================== --- trunk/launchd/src/libvproc_internal.h 2006-10-25 16:36:57 UTC (rev 22918) +++ trunk/launchd/src/libvproc_internal.h 2006-10-26 01:18:08 UTC (rev 22919) @@ -24,6 +24,7 @@ #include "libbootstrap_public.h" typedef char * _internal_string_t; +typedef char * logmsg_t; typedef mach_port_t vproc_mig_t; typedef enum { LAST_EXIT_STATUS = 1, Modified: trunk/launchd/src/libvproc_private.h =================================================================== --- trunk/launchd/src/libvproc_private.h 2006-10-25 16:36:57 UTC (rev 22918) +++ trunk/launchd/src/libvproc_private.h 2006-10-26 01:18:08 UTC (rev 22919) @@ -30,6 +30,9 @@ vproc_err_t _vproc_get_last_exit_status(int *wstatus); vproc_err_t _vproc_set_global_on_demand(bool val); +void _vproc_log(int pri, const char *msg, ...) __attribute__((format(printf, 2, 3))); +void _vproc_log_error(int pri, const char *msg, ...) __attribute__((format(printf, 2, 3))); + #pragma GCC visibility pop __END_DECLS Modified: trunk/launchd/src/protocol_job.defs =================================================================== --- trunk/launchd/src/protocol_job.defs 2006-10-25 16:36:57 UTC (rev 22918) +++ trunk/launchd/src/protocol_job.defs 2006-10-26 01:18:08 UTC (rev 22919) @@ -119,3 +119,9 @@ __bs_port : job_t; __key : get_set_int_key_t; __val : int64_t); + +simpleroutine log( + __bs_port : job_t; + __pri : integer_t; + __err : integer_t; + __msg : logmsg_t);

1 0