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

[23629] tags/launchd-278/
by source_changes＠macosforge.org 20 May '08

20 May '08

Revision: 23629 http://trac.macosforge.org/projects/launchd/changeset/23629 Author: zarzycki(a)apple.com Date: 2008-05-20 13:42:28 -0700 (Tue, 20 May 2008) Log Message: ----------- "Tagging launchd-278 from https://svn.macosforge.org/repository/launchd/trunk" Added Paths: ----------- tags/launchd-278/ Copied: tags/launchd-278 (from rev 23628, trunk)

1 0

[23628] trunk/launchd/src/launchd_core_logic.c
by source_changes＠macosforge.org 16 May '08

16 May '08

Revision: 23628 http://trac.macosforge.org/projects/launchd/changeset/23628 Author: zarzycki(a)apple.com Date: 2008-05-16 16:42:49 -0700 (Fri, 16 May 2008) Log Message: ----------- <rdar://problem/5921590> TENTATIVE: may need to pass a flag to 'sample' once 5921557 is fixed Modified Paths: -------------- trunk/launchd/src/launchd_core_logic.c Modified: trunk/launchd/src/launchd_core_logic.c =================================================================== --- trunk/launchd/src/launchd_core_logic.c 2008-05-13 16:40:57 UTC (rev 23627) +++ trunk/launchd/src/launchd_core_logic.c 2008-05-16 23:42:49 UTC (rev 23628) @@ -5244,7 +5244,7 @@ struct stat sb; char logfile[PATH_MAX]; char pidstr[100]; - char *sample_args[] = { "sample", pidstr, "1", "-mayDie", "-file", logfile, NULL }; + char *sample_args[] = { "sample", pidstr, "1", "-unsupportedShowArch", "-mayDie", "-file", logfile, NULL }; char *contents = NULL; int logfile_fd = -1; int console_fd = -1;

1 0

[23627] tags/launchd-277/
by source_changes＠macosforge.org 13 May '08

13 May '08

Revision: 23627 http://trac.macosforge.org/projects/launchd/changeset/23627 Author: zarzycki(a)apple.com Date: 2008-05-13 09:40:57 -0700 (Tue, 13 May 2008) Log Message: ----------- "Tagging launchd-277 from https://svn.macosforge.org/repository/launchd/trunk" Added Paths: ----------- tags/launchd-277/ Copied: tags/launchd-277 (from rev 23626, trunk)

1 0

[23626] trunk/launchd/src/launchd_core_logic.c
by source_changes＠macosforge.org 09 May '08

09 May '08

Revision: 23626 http://trac.macosforge.org/projects/launchd/changeset/23626 Author: zarzycki(a)apple.com Date: 2008-05-09 15:38:49 -0700 (Fri, 09 May 2008) Log Message: ----------- <rdar://problem/5834727> 10A37: launchd SIGKILL'ing after 2s Modified Paths: -------------- trunk/launchd/src/launchd_core_logic.c Modified: trunk/launchd/src/launchd_core_logic.c =================================================================== --- trunk/launchd/src/launchd_core_logic.c 2008-05-09 20:11:15 UTC (rev 23625) +++ trunk/launchd/src/launchd_core_logic.c 2008-05-09 22:38:49 UTC (rev 23626) @@ -99,8 +99,17 @@ #include "job_reply.h" #include "job_forward.h" +/* + * LAUNCHD_SAMPLE_TIMEOUT + * If the job hasn't exited in the given number of seconds after sending + * it a SIGTERM, start sampling it. + * LAUNCHD_DEFAULT_EXIT_TIMEOUT + * If the job hasn't exited in the given number of seconds after sending + * it a SIGTERM, SIGKILL it. Can be overriden in the job plist. + */ #define LAUNCHD_MIN_JOB_RUN_TIME 10 -#define LAUNCHD_DEFAULT_EXIT_TIMEOUT 2 +#define LAUNCHD_SAMPLE_TIMEOUT 2 +#define LAUNCHD_DEFAULT_EXIT_TIMEOUT 20 #define LAUNCHD_SIGKILL_TIMER 5 #define SHUTDOWN_LOG_DIR "/var/log/shutdown" @@ -413,12 +422,13 @@ internal_exc_handler:1, /* MachExceptionHandler == true */ stall_before_exec:1, /* a hack to support an option of spawn_via_launchd() */ only_once:1, /* man launchd.plist --> LaunchOnlyOnce. Note: 5465184 Rename this to "HopefullyNeverExits" */ - currently_ignored:1, /* Make job_ignore() / job_watch() work. If these calls were balanced, then this wouldn't be necessarily. */ + currently_ignored:1, /* Make job_ignore() / job_watch() work. If these calls were balanced, then this wouldn't be necessarily. */ forced_peers_to_demand_mode:1, /* A job that forced all other jobs to be temporarily launch-on-demand */ setnice:1, /* man launchd.plist --> Nice */ hopefully_exits_last:1, /* man launchd.plist --> HopefullyExitsLast */ removal_pending:1, /* a job was asked to be unloaded/removed while running, we'll remove it after it exits */ sent_sigkill:1, /* job_kill() was called */ + sampled:1, /* job_force_sampletool() was called (or is disabled) */ debug_before_kill:1, /* enter the kernel debugger before killing a job */ weird_bootstrap:1, /* a hack that launchd+launchctl use during jobmgr_t creation */ start_on_mount:1, /* man launchd.plist --> StartOnMount */ @@ -627,12 +637,27 @@ if (newval < 0) { job_kill(j); } else { + /* + * If sampling is enabled and SAMPLE_TIMEOUT is earlier than the job exit_timeout, + * then set a timer for SAMPLE_TIMEOUT seconds after killing + */ + unsigned int exit_timeout = j->exit_timeout; + bool do_sample = do_apple_internal_logging; + unsigned int timeout = exit_timeout; + + if (do_sample && (!exit_timeout || (LAUNCHD_SAMPLE_TIMEOUT < exit_timeout))) { + timeout = LAUNCHD_SAMPLE_TIMEOUT; + } + job_assumes(j, runtime_kill(j->p, SIGTERM) != -1); - if (j->exit_timeout) { + if (timeout) { + j->sampled = !do_sample; job_assumes(j, kevent_mod((uintptr_t)&j->exit_timeout, EVFILT_TIMER, - EV_ADD|EV_ONESHOT, NOTE_SECONDS, j->exit_timeout, j) != -1); - } else { + EV_ADD|EV_ONESHOT, NOTE_SECONDS, timeout, j) != -1); + } + + if (!exit_timeout) { job_log(j, LOG_DEBUG, "This job has an infinite exit timeout"); } @@ -2424,6 +2449,7 @@ } j->last_exit_status = status; j->sent_sigkill = false; + j->sampled = false; j->sent_kill_via_shmem = false; j->lastlookup = NULL; j->lastlookup_gennum = 0; @@ -2671,20 +2697,39 @@ j->start_pending = true; job_dispatch(j, false); } else if (&j->exit_timeout == ident) { + /* + * This block might be executed up to 3 times for a given (slow) job + * - once for the SAMPLE_TIMEOUT timer, at which point sampling is triggered + * - once for the exit_timeout timer, at which point: + * - sampling is performed if not triggered previously + * - SIGKILL is being sent to the job + * - once for the SIGKILL_TIMER timer, at which point we log an issue + * with the long SIGKILL + */ if (j->sent_sigkill) { uint64_t td = runtime_get_nanoseconds_since(j->sent_sigterm_time); td /= NSEC_PER_SEC; td -= j->exit_timeout; - job_log(j, LOG_ERR, "Did not die after sending SIGKILL %llu seconds ago...", td); + job_log(j, LOG_WARNING, "Did not die after sending SIGKILL %llu seconds ago...", td); + } else if (!j->sampled && (!j->exit_timeout || (LAUNCHD_SAMPLE_TIMEOUT < j->exit_timeout))) { + /* This should work even if the job changes its exit_timeout midstream */ + job_log(j, LOG_NOTICE, "Sampling timeout elapsed (%u seconds). Sampling...", LAUNCHD_SAMPLE_TIMEOUT); + if (j->exit_timeout) { + unsigned int ttk = (j->exit_timeout - LAUNCHD_SAMPLE_TIMEOUT); + job_assumes(j, kevent_mod((uintptr_t)&j->exit_timeout, EVFILT_TIMER, + EV_ADD|EV_ONESHOT, NOTE_SECONDS, ttk, j) != -1); + job_log(j, LOG_NOTICE, "Scheduled new exit timeout for %u seconds later", ttk); + } + job_force_sampletool(j); } else { - job_force_sampletool(j); + job_force_sampletool(j); /* no-op if already done in previous pass */ if (unlikely(j->debug_before_kill)) { - job_log(j, LOG_NOTICE, "Exit timeout elapsed. Entering the kernel debugger."); + job_log(j, LOG_NOTICE, "Exit timeout elapsed. Entering the kernel debugger"); job_assumes(j, host_reboot(mach_host_self(), HOST_REBOOT_DEBUGGER) == KERN_SUCCESS); } - job_log(j, LOG_WARNING, "Exit timeout elapsed (%u seconds). Killing.", j->exit_timeout); + job_log(j, LOG_WARNING, "Exit timeout elapsed (%u seconds). Killing", j->exit_timeout); job_kill(j); } } else { @@ -3394,7 +3439,7 @@ if (j->stdin_fd) { job_assumes(j, dup2(j->stdin_fd, STDIN_FILENO) != -1); } else { - job_setup_fd(j, STDIN_FILENO, j->stdinpath, O_RDONLY|O_CREAT); + job_setup_fd(j, STDIN_FILENO, j->stdinpath, O_RDONLY|O_CREAT); } job_setup_fd(j, STDOUT_FILENO, j->stdoutpath, O_WRONLY|O_CREAT|O_APPEND); job_setup_fd(j, STDERR_FILENO, j->stderrpath, O_WRONLY|O_CREAT|O_APPEND); @@ -5206,10 +5251,15 @@ int wstatus; pid_t sp; - if (!do_apple_internal_logging) { + if (j->sampled) { return; } - + j->sampled = true; + + if (!job_assumes(j, do_apple_internal_logging)) { + return; + } + if (!job_assumes(j, mkdir(SHUTDOWN_LOG_DIR, S_IRWXU) != -1 || errno == EEXIST)) { return; }

1 0

[23625] tags/launchd-276/
by source_changes＠macosforge.org 09 May '08

09 May '08

Revision: 23625 http://trac.macosforge.org/projects/launchd/changeset/23625 Author: zarzycki(a)apple.com Date: 2008-05-09 13:11:15 -0700 (Fri, 09 May 2008) Log Message: ----------- "Tagging launchd-276 from https://svn.macosforge.org/repository/launchd/trunk" Added Paths: ----------- tags/launchd-276/ Copied: tags/launchd-276 (from rev 23624, trunk)

1 0

[23624] trunk/launchd/src/libvproc.c
by source_changes＠macosforge.org 09 May '08

09 May '08

Revision: 23624 http://trac.macosforge.org/projects/launchd/changeset/23624 Author: zarzycki(a)apple.com Date: 2008-05-09 13:10:09 -0700 (Fri, 09 May 2008) Log Message: ----------- <rdar://problem/5858877> Make vproc_transaction_{begin,end} available to command-line tools Modified Paths: -------------- trunk/launchd/src/libvproc.c Modified: trunk/launchd/src/libvproc.c =================================================================== --- trunk/launchd/src/libvproc.c 2008-05-09 20:05:28 UTC (rev 23623) +++ trunk/launchd/src/libvproc.c 2008-05-09 20:10:09 UTC (rev 23624) @@ -164,6 +164,10 @@ { typeof(vproc_shmem->vp_shmem_transaction_cnt) newval; + if (unlikely(vproc_shmem == NULL)) { + return; + } + newval = __sync_sub_and_fetch(&vproc_shmem->vp_shmem_transaction_cnt, 1); if (unlikely(newval < 0)) {

1 0

[23623] trunk/launchd/src/libbootstrap.c
by source_changes＠macosforge.org 09 May '08

09 May '08

Revision: 23623 http://trac.macosforge.org/projects/launchd/changeset/23623 Author: zarzycki(a)apple.com Date: 2008-05-09 13:05:28 -0700 (Fri, 09 May 2008) Log Message: ----------- <rdar://problem/5915392> Drag and drop no longer works from Finder to TextEdit - problem in bootstrap_look_up2? Modified Paths: -------------- trunk/launchd/src/libbootstrap.c Modified: trunk/launchd/src/libbootstrap.c =================================================================== --- trunk/launchd/src/libbootstrap.c 2008-05-07 22:15:06 UTC (rev 23622) +++ trunk/launchd/src/libbootstrap.c 2008-05-09 20:05:28 UTC (rev 23623) @@ -173,11 +173,16 @@ static mach_port_t prev_bp; static mach_port_t prev_sp; static name_t prev_name; + bool per_pid_lookup = flags & BOOTSTRAP_PER_PID_SERVICE; kern_return_t kr = 0; mach_port_t puc; pthread_mutex_lock(&bslu2_lock); + if (per_pid_lookup) { + goto skip_cache; + } + if (prev_sp) { if ((bp == prev_bp) && (strncmp(prev_name, service_name, sizeof(name_t)) == 0) && (mach_port_mod_refs(mach_task_self(), prev_sp, MACH_PORT_RIGHT_SEND, 1) == 0)) { @@ -189,6 +194,7 @@ } } +skip_cache: if ((kr = vproc_mig_look_up2(bp, service_name, sp, target_pid, flags)) != VPROC_ERR_TRY_PER_USER) { goto out; } @@ -201,7 +207,8 @@ mach_port_deallocate(mach_task_self(), puc); out: - if (kr == 0 && prev_sp == 0 && mach_port_mod_refs(mach_task_self(), *sp, MACH_PORT_RIGHT_SEND, 1) == 0) { + if (!per_pid_lookup && kr == 0 && prev_sp == 0 + && mach_port_mod_refs(mach_task_self(), *sp, MACH_PORT_RIGHT_SEND, 1) == 0) { /* We're going to hold on to a send right as a MRU cache */ prev_bp = bp; prev_sp = *sp;

1 0

[23622] tags/launchd-275/
by source_changes＠macosforge.org 07 May '08

07 May '08

Revision: 23622 http://trac.macosforge.org/projects/launchd/changeset/23622 Author: zarzycki(a)apple.com Date: 2008-05-07 15:15:06 -0700 (Wed, 07 May 2008) Log Message: ----------- "Tagging launchd-275 from https://svn.macosforge.org/repository/launchd/trunk" Added Paths: ----------- tags/launchd-275/ Copied: tags/launchd-275 (from rev 23621, trunk)

1 0

[23621] trunk/launchd/src/launchd_runtime.c
by source_changes＠macosforge.org 05 May '08

05 May '08

Revision: 23621 http://trac.macosforge.org/projects/launchd/changeset/23621 Author: zarzycki(a)apple.com Date: 2008-05-05 16:31:03 -0700 (Mon, 05 May 2008) Log Message: ----------- <rdar://problem/5856084> 10A43: NFS trying to connect to servers after the VPN is down Modified Paths: -------------- trunk/launchd/src/launchd_runtime.c Modified: trunk/launchd/src/launchd_runtime.c =================================================================== --- trunk/launchd/src/launchd_runtime.c 2008-05-05 20:23:42 UTC (rev 23620) +++ trunk/launchd/src/launchd_runtime.c 2008-05-05 23:31:03 UTC (rev 23621) @@ -37,6 +37,7 @@ #include <mach/exception.h> #include <sys/types.h> #include <sys/stat.h> +#include <sys/sysctl.h> #include <sys/time.h> #include <sys/proc.h> #include <sys/event.h> @@ -147,6 +148,7 @@ { mach_msg_size_t mxmsgsz; pthread_attr_t attr; + pid_t p = getpid(); launchd_assert((mainkq = kqueue()) != -1); @@ -175,6 +177,8 @@ pthread_attr_setstacksize(&attr, PTHREAD_STACK_MIN); launchd_assert(pthread_create(&demand_thread, &attr, mport_demand_loop, NULL) == 0); pthread_attr_destroy(&attr); + + launchd_assumes(sysctlbyname("vfs.generic.noremotehang", NULL, NULL, &p, sizeof(p)) != -1); } INTERNAL_ABI void @@ -731,6 +735,9 @@ launchd_assumes(sigprocmask(SIG_SETMASK, &oset, NULL) != -1); launchd_assumes(launchd_set_bport(MACH_PORT_NULL) == KERN_SUCCESS); } else { + pid_t p = -getpid(); + launchd_assumes(sysctlbyname("vfs.generic.noremotehang", NULL, NULL, &p, sizeof(p)) != -1); + launchd_assumes(sigprocmask(SIG_SETMASK, &emptyset, NULL) != -1); }

1 0

[23620] trunk/launchd/src/launchd_core_logic.c
by source_changes＠macosforge.org 05 May '08

05 May '08

Revision: 23620 http://trac.macosforge.org/projects/launchd/changeset/23620 Author: zarzycki(a)apple.com Date: 2008-05-05 13:23:42 -0700 (Mon, 05 May 2008) Log Message: ----------- <rdar://problem/5804075> launchd fork/exec log message is incorrect Modified Paths: -------------- trunk/launchd/src/launchd_core_logic.c Modified: trunk/launchd/src/launchd_core_logic.c =================================================================== --- trunk/launchd/src/launchd_core_logic.c 2008-05-02 23:19:42 UTC (rev 23619) +++ trunk/launchd/src/launchd_core_logic.c 2008-05-05 20:23:42 UTC (rev 23620) @@ -475,7 +475,7 @@ static void job_callback_timer(job_t j, void *ident); 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 void job_log_children_without_exec(job_t j); 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)); @@ -2564,7 +2564,7 @@ } void -job_log_chidren_without_exec(job_t j) +job_log_children_without_exec(job_t j) { /* <rdar://problem/5701343> ER: Add a KERN_PROC_PPID sysctl */ #ifdef KERN_PROC_PPID @@ -2599,7 +2599,7 @@ continue; } - job_log(j, LOG_APPLEONLY, "Performance and sanity: fork() without exec*(). Please switch to posix_spawn(). Child PID %u", + job_log(j, LOG_APPLEONLY, "Called *fork(). Please switch to posix_spawn*(), pthreads or launchd. Child PID %u", kp[i].kp_proc.p_pid); } @@ -2641,7 +2641,7 @@ if (fflags & NOTE_FORK) { job_log(j, LOG_DEBUG, "fork()ed%s", program_changed ? ". For this message only: We don't know whether this event happened before or after execve()." : ""); - job_log_chidren_without_exec(j); + job_log_children_without_exec(j); } if (fflags & NOTE_EXIT) {

1 0