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

[23058] tags/launchd-194/
by source_changes＠macosforge.org 13 Feb '07

13 Feb '07

Revision: 23058 http://trac.macosforge.org/projects/launchd/changeset/23058 Author: zarzycki(a)apple.com Date: 2007-02-13 13:39:11 -0800 (Tue, 13 Feb 2007) Log Message: ----------- "Tagging launchd-194 from https://svn.macosforge.org/repository/launchd/trunk" Added Paths: ----------- tags/launchd-194/ Copied: tags/launchd-194 (from rev 23057, trunk)

1 0

[23057] trunk/launchd/src/launchd_core_logic.c
by source_changes＠macosforge.org 12 Feb '07

12 Feb '07

Revision: 23057 http://trac.macosforge.org/projects/launchd/changeset/23057 Author: zarzycki(a)apple.com Date: 2007-02-11 21:21:36 -0800 (Sun, 11 Feb 2007) Log Message: ----------- <rdar://problem/4989673> Bug: launchd_core_logic.c:604 (23046):3: j->p == 0 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-02-12 05:08:01 UTC (rev 23056) +++ trunk/launchd/src/launchd_core_logic.c 2007-02-12 05:21:36 UTC (rev 23057) @@ -273,7 +273,7 @@ importing_global_env:1, importing_hard_limits:1, setmask:1, legacy_mach_job:1, runatload:1; mode_t mask; unsigned int globargv:1, wait4debugger:1, unload_at_exit:1, stall_before_exec:1, only_once:1, - currently_ignored:1, forced_peers_to_demand_mode:1, setnice:1, hopefully_exits_last:1; + currently_ignored:1, forced_peers_to_demand_mode:1, setnice:1, hopefully_exits_last:1, removal_pending:1; char label[0]; }; @@ -599,17 +599,21 @@ struct machservice *ms; struct semaphoreitem *si; - job_log(j, LOG_DEBUG, "Removed"); + if (j->p) { + job_log(j, LOG_DEBUG, "Removal pended until the job exits."); + if (!j->removal_pending) { + j->removal_pending = true; + job_stop(j); + } + + return; + } + if (j->forced_peers_to_demand_mode) { job_set_global_on_demand(j, false); } - if (!job_assumes(j, j->p == 0)) { - job_assumes(j, kill(j->p, SIGKILL) != -1); - job_reap(j); - } - if (!job_assumes(j, j->forkfd == 0)) { job_assumes(j, close(j->forkfd) != -1); } @@ -689,6 +693,8 @@ jobmgr_tickle(j->mgr); } + job_log(j, LOG_DEBUG, "Removed"); + free(j); } @@ -2850,6 +2856,9 @@ } job_log(j, LOG_INFO, "Exited. Was only configured to run once."); return true; + } else if (j->removal_pending) { + job_log(j, LOG_DEBUG, "Exited while removal was pending."); + return true; } else if (j->mgr->shutting_down) { job_log(j, LOG_NOTICE, "Exited while shutdown in progress. Processes remaining: %u", total_children); return true;

1 0

[23056] trunk/launchd/src/launchd_core_logic.c
by source_changes＠macosforge.org 12 Feb '07

12 Feb '07

Revision: 23056 http://trac.macosforge.org/projects/launchd/changeset/23056 Author: zarzycki(a)apple.com Date: 2007-02-11 21:08:01 -0800 (Sun, 11 Feb 2007) Log Message: ----------- kqueue dispatch clean up. 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-02-10 16:52:04 UTC (rev 23055) +++ trunk/launchd/src/launchd_core_logic.c 2007-02-12 05:08:01 UTC (rev 23056) @@ -129,7 +129,7 @@ static void socketgroup_delete(job_t j, struct socketgroup *sg); static void socketgroup_watch(job_t j, struct socketgroup *sg); static void socketgroup_ignore(job_t j, struct socketgroup *sg); -static void socketgroup_callback(job_t j, struct kevent *kev); +static void socketgroup_callback(job_t j); static void socketgroup_setup(launch_data_t obj, const char *key, void *context); struct calendarinterval { @@ -141,7 +141,7 @@ static bool calendarinterval_new_from_obj(job_t j, launch_data_t obj); static void calendarinterval_delete(job_t j, struct calendarinterval *ci); static void calendarinterval_setalarm(job_t j, struct calendarinterval *ci); -static void calendarinterval_callback(job_t j, struct kevent *kev); +static void calendarinterval_callback(job_t j, void *ident); struct envitem { SLIST_ENTRY(envitem) sle; @@ -303,6 +303,9 @@ static void job_force_sampletool(job_t j); static void job_reparent_hack(job_t j, const char *where); static void job_callback(void *obj, struct kevent *kev); +static void job_callback_proc(job_t j, int fflags); +static void job_callback_timer(job_t j, void *ident); +static void job_callback_read(job_t j, int ident); static launch_data_t job_export2(job_t j, bool subjobs); static job_t job_new_spawn(job_t j, const char *label, const char *path, const char *workingdir, const char *const *argv, const char *const *env, mode_t *u_mask, bool w4d); static job_t job_new_via_mach_init(job_t j, const char *cmd, uid_t uid, bool ond); @@ -1774,47 +1777,60 @@ } void +job_callback_proc(job_t j, int fflags) +{ + if (fflags & NOTE_EXEC) { + job_log(j, LOG_DEBUG, "Called execve()"); + } + + if (fflags & NOTE_EXIT) { + job_reap(j); + job_dispatch(j, false); + } +} + +void +job_callback_timer(job_t j, void *ident) +{ + if (j == ident || &j->start_interval == ident) { + job_dispatch(j, true); + } else if (&j->exit_timeout == ident) { + job_force_sampletool(j); + job_log(j, LOG_WARNING, "Exit timeout elapsed (%u seconds). Killing.", j->exit_timeout); + job_kill(j); + } else { + calendarinterval_callback(j, ident); + } +} + +void +job_callback_read(job_t j, int ident) +{ + if (ident == j->log_redirect_fd) { + job_log_stdouterr(j); + } else { + socketgroup_callback(j); + } +} + +void job_callback(void *obj, struct kevent *kev) { job_t j = obj; switch (kev->filter) { case EVFILT_PROC: - if (kev->fflags & NOTE_EXEC) { - job_log(j, LOG_DEBUG, "Called execve()"); - } - if (kev->fflags & NOTE_EXIT) { - job_reap(j); - job_dispatch(j, false); - } - break; + return job_callback_proc(j, kev->fflags); case EVFILT_TIMER: - if ((uintptr_t)j == kev->ident || (uintptr_t)&j->start_interval == kev->ident) { - job_dispatch(j, true); - } else if ((uintptr_t)&j->exit_timeout == kev->ident) { - job_force_sampletool(j); - job_log(j, LOG_WARNING, "Exit timeout elapsed (%u seconds). Killing.", j->exit_timeout); - job_kill(j); - } else { - calendarinterval_callback(j, kev); - } - break; + return job_callback_timer(j, (void *)kev->ident); case EVFILT_VNODE: - semaphoreitem_callback(j, kev); - break; + return semaphoreitem_callback(j, kev); case EVFILT_READ: - if (kev->ident == (uintptr_t)j->log_redirect_fd) { - job_log_stdouterr(j); - } else { - socketgroup_callback(j, kev); - } - break; + return job_callback_read(j, kev->ident); case EVFILT_MACHPORT: - job_dispatch(j, true); - break; + return (void)job_dispatch(j, true); default: - job_assumes(j, false); - break; + return (void)job_assumes(j, false); } } @@ -2607,12 +2623,12 @@ } void -calendarinterval_callback(job_t j, struct kevent *kev) +calendarinterval_callback(job_t j, void *ident) { struct calendarinterval *ci; SLIST_FOREACH(ci, &j->cal_intervals, sle) { - if ((uintptr_t)ci == kev->ident) { + if (ci == ident) { break; } } @@ -2704,7 +2720,7 @@ } void -socketgroup_callback(job_t j, struct kevent *kev) +socketgroup_callback(job_t j) { job_dispatch(j, true); }

1 0

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

10 Feb '07

Revision: 23055 http://trac.macosforge.org/projects/launchd/changeset/23055 Author: zarzycki(a)apple.com Date: 2007-02-10 08:52:04 -0800 (Sat, 10 Feb 2007) Log Message: ----------- Minor bug fixes. 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-02-10 03:25:34 UTC (rev 23054) +++ trunk/launchd/src/launchd_core_logic.c 2007-02-10 16:52:04 UTC (rev 23055) @@ -3668,6 +3668,7 @@ char *contents = NULL; int logfile_fd = -1; int console_fd = -1; + int wstatus; pid_t sp; if (!debug_shutdown_hangs) { @@ -3685,17 +3686,23 @@ * We didn't give the 'sample' tool a bootstrap port, so it therefore * can't deadlock against launchd. */ - if (job_assumes(j, (errno = posix_spawnp(&sp, sample_args[0], NULL, NULL, sample_args, environ)) == 0)) { - int wstatus; + if (!job_assumes(j, (errno = posix_spawnp(&sp, sample_args[0], NULL, NULL, sample_args, environ)) == 0)) { + goto out; + } - job_assumes(j, waitpid(sp, &wstatus, 0) != -1); + if (!job_assumes(j, waitpid(sp, &wstatus, 0) != -1)) { + goto out; } + if (!job_assumes(j, WIFEXITED(wstatus) && WEXITSTATUS(wstatus) == 0)) { + goto out; + } + if (!job_assumes(j, (logfile_fd = open(logfile, O_RDONLY|O_NOCTTY)) != -1)) { goto out; } - if (!job_assumes(j, (console_fd = open(_PATH_CONSOLE, O_WRONLY|O_APPEND||O_NOCTTY)) != -1)) { + if (!job_assumes(j, (console_fd = open(_PATH_CONSOLE, O_WRONLY|O_APPEND|O_NOCTTY)) != -1)) { goto out; }

1 0

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

10 Feb '07

Revision: 23054 http://trac.macosforge.org/projects/launchd/changeset/23054 Author: zarzycki(a)apple.com Date: 2007-02-09 19:25:34 -0800 (Fri, 09 Feb 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-02-09 22:51:16 UTC (rev 23053) +++ trunk/launchd/src/launchd_core_logic.c 2007-02-10 03:25:34 UTC (rev 23054) @@ -201,7 +201,6 @@ char *jm_stdout; char *jm_stderr; unsigned int global_on_demand_cnt; - unsigned int would_have_sigkilled; unsigned int transfer_bstrap:1, sent_stop_to_hopeful_jobs:1, shutting_down:1; char name[0]; }; @@ -1771,14 +1770,7 @@ void job_kill(job_t j) { - if (debug_shutdown_hangs) { - j->mgr->would_have_sigkilled++; - if (j->mgr->would_have_sigkilled >= total_children) { - job_assumes(j, host_reboot(mach_host_self(), HOST_REBOOT_DEBUGGER) == 0); - } - } else { - job_assumes(j, kill(j->p, SIGKILL) != -1); - } + job_assumes(j, kill(j->p, SIGKILL) != -1); } void @@ -1788,8 +1780,13 @@ switch (kev->filter) { case EVFILT_PROC: - job_reap(j); - job_dispatch(j, false); + if (kev->fflags & NOTE_EXEC) { + job_log(j, LOG_DEBUG, "Called execve()"); + } + if (kev->fflags & NOTE_EXIT) { + job_reap(j); + job_dispatch(j, false); + } break; case EVFILT_TIMER: if ((uintptr_t)j == kev->ident || (uintptr_t)&j->start_interval == kev->ident) { @@ -1925,7 +1922,7 @@ job_assumes(j, close(spair[1]) == 0); ipc_open(_fd(spair[0]), j); } - if (kevent_mod(c, EVFILT_PROC, EV_ADD, NOTE_EXIT, 0, &j->kqjob_callback) == -1) { + if (kevent_mod(c, EVFILT_PROC, EV_ADD, NOTE_EXEC|NOTE_EXIT, 0, &j->kqjob_callback) == -1) { job_log_error(j, LOG_ERR, "kevent()"); job_reap(j); } else { @@ -3501,13 +3498,8 @@ void machservice_delete(struct machservice *ms) { - if (ms->recv) { - if (ms->isActive) { - /* FIXME we should cancel the notification */ - job_log(ms->job, LOG_DEBUG, "Mach service deleted while we didn't own the receive right: %s", ms->name); - } else { - job_assumes(ms->job, launchd_mport_close_recv(ms->port) == KERN_SUCCESS); - } + if (ms->recv && job_assumes(ms->job, !ms->isActive)) { + job_assumes(ms->job, launchd_mport_close_recv(ms->port) == KERN_SUCCESS); } job_assumes(ms->job, launchd_mport_deallocate(ms->port) == KERN_SUCCESS);

1 0

[23053] trunk/launchd/src
by source_changes＠macosforge.org 09 Feb '07

09 Feb '07

Revision: 23053 http://trac.macosforge.org/projects/launchd/changeset/23053 Author: zarzycki(a)apple.com Date: 2007-02-09 14:51:16 -0800 (Fri, 09 Feb 2007) Log Message: ----------- Move call to exit() and reboot() to jobmgr_remove(root_jobmgr). Modified Paths: -------------- trunk/launchd/src/launchd.c trunk/launchd/src/launchd_core_logic.c trunk/launchd/src/launchd_core_logic.h Modified: trunk/launchd/src/launchd.c =================================================================== --- trunk/launchd/src/launchd.c 2007-02-09 22:31:36 UTC (rev 23052) +++ trunk/launchd/src/launchd.c 2007-02-09 22:51:16 UTC (rev 23053) @@ -417,7 +417,7 @@ rlcj = NULL; - root_jobmgr = jobmgr_shutdown(root_jobmgr); + launchd_assert(jobmgr_shutdown(root_jobmgr) != NULL); } void @@ -624,7 +624,8 @@ void launchd_post_kevent(void) { - if (shutdown_in_progress && (!root_jobmgr || jobmgr_is_idle(root_jobmgr))) { +#if 0 + if (shutdown_in_progress && jobmgr_is_idle(root_jobmgr)) { shutdown_in_progress = false; if (getpid() == 1) { @@ -632,11 +633,9 @@ kill(-1, SIGKILL); /* One last time, just to clear the room */ launchd_assumes(execl("/sbin/launchd", "/sbin/launchd", "-s", NULL) != -1); } - launchd_assumes(reboot(RB_HALT) != -1); - } else { - exit(EXIT_SUCCESS); } } +#endif if (getpid() == 1) { if (rlcj && job_active(rlcj)) { return; Modified: trunk/launchd/src/launchd_core_logic.c =================================================================== --- trunk/launchd/src/launchd_core_logic.c 2007-02-09 22:31:36 UTC (rev 23052) +++ trunk/launchd/src/launchd_core_logic.c 2007-02-09 22:51:16 UTC (rev 23053) @@ -40,6 +40,7 @@ #include <sys/ucred.h> #include <sys/fcntl.h> #include <sys/un.h> +#include <sys/reboot.h> #include <sys/wait.h> #include <sys/sysctl.h> #include <sys/sockio.h> @@ -211,6 +212,7 @@ static jobmgr_t jobmgr_new(jobmgr_t jm, mach_port_t requestorport, mach_port_t checkin_port); static jobmgr_t jobmgr_parent(jobmgr_t jm); static jobmgr_t jobmgr_tickle(jobmgr_t jm); +static bool jobmgr_is_idle(jobmgr_t jm); static void jobmgr_log_stray_children(jobmgr_t jm); static void jobmgr_remove(jobmgr_t jm); static void jobmgr_dispatch_all(jobmgr_t jm); @@ -576,6 +578,10 @@ if (jm->parentmgr) { SLIST_REMOVE(&jm->parentmgr->submgrs, jm, jobmgr_s, sle); jobmgr_tickle(jm->parentmgr); + } else if (getpid() == 1) { + jobmgr_assumes(jm, reboot(RB_HALT) != -1); + } else { + exit(EXIT_SUCCESS); } free(jm); Modified: trunk/launchd/src/launchd_core_logic.h =================================================================== --- trunk/launchd/src/launchd_core_logic.h 2007-02-09 22:31:36 UTC (rev 23052) +++ trunk/launchd/src/launchd_core_logic.h 2007-02-09 22:51:16 UTC (rev 23053) @@ -31,7 +31,6 @@ void jobmgr_set_stdout(jobmgr_t jm, const char *what); void jobmgr_set_stderr(jobmgr_t jm, const char *what); -bool jobmgr_is_idle(jobmgr_t jm); jobmgr_t jobmgr_shutdown(jobmgr_t jm); void jobmgr_dispatch_all_semaphores(jobmgr_t jm); job_t jobmgr_find(jobmgr_t jm, const char *label);

1 0

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

09 Feb '07

Revision: 23052 http://trac.macosforge.org/projects/launchd/changeset/23052 Author: zarzycki(a)apple.com Date: 2007-02-09 14:31:36 -0800 (Fri, 09 Feb 2007) Log Message: ----------- Even better shutdown debugging. 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-02-09 17:56:21 UTC (rev 23051) +++ trunk/launchd/src/launchd_core_logic.c 2007-02-09 22:31:36 UTC (rev 23052) @@ -32,6 +32,7 @@ #include <mach/host_info.h> #include <mach/mach_host.h> #include <mach/exception.h> +#include <mach/host_reboot.h> #include <sys/types.h> #include <sys/queue.h> #include <sys/event.h> @@ -199,6 +200,7 @@ char *jm_stdout; char *jm_stderr; unsigned int global_on_demand_cnt; + unsigned int would_have_sigkilled; unsigned int transfer_bstrap:1, sent_stop_to_hopeful_jobs:1, shutting_down:1; char name[0]; }; @@ -209,6 +211,7 @@ static jobmgr_t jobmgr_new(jobmgr_t jm, mach_port_t requestorport, mach_port_t checkin_port); static jobmgr_t jobmgr_parent(jobmgr_t jm); static jobmgr_t jobmgr_tickle(jobmgr_t jm); +static void jobmgr_log_stray_children(jobmgr_t jm); static void jobmgr_remove(jobmgr_t jm); static void jobmgr_dispatch_all(jobmgr_t jm); static job_t jobmgr_new_anonymous(jobmgr_t jm); @@ -305,6 +308,7 @@ static const char *job_prog(job_t j); static pid_t job_get_pid(job_t j); static jobmgr_t job_get_bs(job_t j); +static void job_kill(job_t j); static void job_uncork_fork(job_t j); static void job_log_stdouterr(job_t j); static void job_logv(job_t j, int pri, int err, const char *msg, va_list ap); @@ -337,6 +341,7 @@ static bool cronemu_hour(struct tm *wtm, int hour, int min); static bool cronemu_min(struct tm *wtm, int min); +static unsigned int total_children; static int dir_has_files(job_t j, const char *path); static char **mach_cmd2argv(const char *string); jobmgr_t root_jobmgr; @@ -1628,6 +1633,8 @@ return; } + total_children--; + /* Performance hack */ TAILQ_REMOVE(&j->mgr->jobs, j, sle); TAILQ_INSERT_TAIL(&j->mgr->jobs, j, sle); @@ -1756,6 +1763,19 @@ } void +job_kill(job_t j) +{ + if (debug_shutdown_hangs) { + j->mgr->would_have_sigkilled++; + if (j->mgr->would_have_sigkilled >= total_children) { + job_assumes(j, host_reboot(mach_host_self(), HOST_REBOOT_DEBUGGER) == 0); + } + } else { + job_assumes(j, kill(j->p, SIGKILL) != -1); + } +} + +void job_callback(void *obj, struct kevent *kev) { job_t j = obj; @@ -1771,7 +1791,7 @@ } else if ((uintptr_t)&j->exit_timeout == kev->ident) { job_force_sampletool(j); job_log(j, LOG_WARNING, "Exit timeout elapsed (%u seconds). Killing.", j->exit_timeout); - job_assumes(j, kill(j->p, SIGKILL) != -1); + job_kill(j); } else { calendarinterval_callback(j, kev); } @@ -1883,6 +1903,8 @@ job_start_child(j); break; default: + total_children++; + /* Performance hack */ TAILQ_REMOVE(&j->mgr->jobs, j, sle); TAILQ_INSERT_HEAD(&j->mgr->jobs, j, sle); @@ -2810,16 +2832,7 @@ job_log(j, LOG_INFO, "Exited. Was only configured to run once."); return true; } else if (j->mgr->shutting_down) { - unsigned int cnt = 0; - job_t ji; - - TAILQ_FOREACH(ji, &j->mgr->jobs, sle) { - if (ji->p) { - cnt++; - } - } - - job_log(j, LOG_INFO, "Exited while shutdown in progress. Processes remaining: %u", cnt); + job_log(j, LOG_NOTICE, "Exited while shutdown in progress. Processes remaining: %u", total_children); return true; } else if (!j->checkedin && (!SLIST_EMPTY(&j->sockets) || !SLIST_EMPTY(&j->machservices))) { job_log(j, LOG_WARNING, "Failed to check-in!"); @@ -3197,6 +3210,7 @@ jm->sent_stop_to_hopeful_jobs = true; if (jobmgr_is_idle(jm)) { + jobmgr_log_stray_children(jm); jobmgr_remove(jm); return NULL; } @@ -3204,6 +3218,42 @@ return jm; } +void +jobmgr_log_stray_children(jobmgr_t jm) +{ + int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_ALL }; + size_t i, kp_cnt, len = 10*1024*1024; + struct kinfo_proc *kp; + + if (jm->parentmgr || getpid() != 1) { + return; + } + + if (!jobmgr_assumes(jm, (kp = malloc(len)) != NULL)) { + return; + } + if (!jobmgr_assumes(jm, sysctl(mib, 3, kp, &len, NULL, 0) != -1)) { + goto out; + } + + kp_cnt = len / sizeof(struct kinfo_proc); + + for (i = 0; i < kp_cnt; i++) { + pid_t p_i = kp[i].kp_proc.p_pid; + pid_t pp_i = kp[i].kp_eproc.e_ppid; + + if (p_i == 0 || p_i == 1) { + continue; + } + + jobmgr_log(jm, LOG_WARNING, "Stray process at shutdown: PID %u PPID %u %s", p_i, pp_i, kp[i].kp_proc.p_comm); + jobmgr_assumes(jm, kill(p_i, SIGKILL) != -1); + } + +out: + free(kp); +} + bool jobmgr_is_idle(jobmgr_t jm) {

1 0

[23051] trunk/launchd/src
by source_changes＠macosforge.org 09 Feb '07

09 Feb '07

Revision: 23051 http://trac.macosforge.org/projects/launchd/changeset/23051 Author: zarzycki(a)apple.com Date: 2007-02-09 09:56:21 -0800 (Fri, 09 Feb 2007) Log Message: ----------- Better shutdown debugging. Modified Paths: -------------- trunk/launchd/src/launchd.c trunk/launchd/src/launchd.h trunk/launchd/src/launchd_core_logic.c Modified: trunk/launchd/src/launchd.c =================================================================== --- trunk/launchd/src/launchd.c 2007-02-09 01:51:31 UTC (rev 23050) +++ trunk/launchd/src/launchd.c 2007-02-09 17:56:21 UTC (rev 23051) @@ -394,28 +394,26 @@ void launchd_shutdown(void) { + struct stat sb; + if (shutdown_in_progress) { return; } shutdown_in_progress = true; -#if 0 - struct stat sb; + if (getpid() == 1) { + if (stat("/var/db/debugShutdownHangs", &sb) != -1) { + /* + * When this changes to a more sustainable API, update this: + * http://howto.apple.com/db.cgi?Debugging_Apps_Non-Responsive_At_Shutdown + */ + debug_shutdown_hangs = true; + } - if (stat("/var/db/debugShutdownHangs", &sb) != -1) { - /* - * When this changes to a more sustainable API, update this: - * http://howto.apple.com/db.cgi?Debugging_Apps_Non-Responsive_At_Shutdown - */ - debug_shutdown_hangs = true; - } -#else - if (getpid() == 1) { launchd_assumes(kevent_mod((uintptr_t)debugshutdown_callback, EVFILT_TIMER, EV_ADD|EV_ONESHOT, NOTE_SECONDS, 5, &kqdebugshutdown_callback) != -1); } -#endif rlcj = NULL; @@ -654,6 +652,9 @@ pid_t sddp; if (launchd_assumes(posix_spawn(&sddp, sdd_args[0], NULL, NULL, sdd_args, environ) == 0)) { - launchd_assumes(kevent_mod(sddp, EVFILT_PROC, EV_ADD, NOTE_EXIT, 0, &kqsimple_zombie_reaper) != -1); + int wstatus; + + /* No bootstrap port was given. It is safe to block. */ + launchd_assumes(waitpid(sddp, &wstatus, 0) != -1); } } Modified: trunk/launchd/src/launchd.h =================================================================== --- trunk/launchd/src/launchd.h 2007-02-09 01:51:31 UTC (rev 23050) +++ trunk/launchd/src/launchd.h 2007-02-09 17:56:21 UTC (rev 23051) @@ -31,7 +31,6 @@ struct kevent; struct conncb; -extern kq_callback kqsimple_zombie_reaper; extern sigset_t blocked_signals; extern bool debug_shutdown_hangs; extern bool network_up; Modified: trunk/launchd/src/launchd_core_logic.c =================================================================== --- trunk/launchd/src/launchd_core_logic.c 2007-02-09 01:51:31 UTC (rev 23050) +++ trunk/launchd/src/launchd_core_logic.c 2007-02-09 17:56:21 UTC (rev 23051) @@ -337,22 +337,12 @@ static bool cronemu_hour(struct tm *wtm, int hour, int min); static bool cronemu_min(struct tm *wtm, int min); -static void simple_zombie_reaper(void *, struct kevent *); - -kq_callback kqsimple_zombie_reaper = simple_zombie_reaper; - static int dir_has_files(job_t j, const char *path); static char **mach_cmd2argv(const char *string); jobmgr_t root_jobmgr; jobmgr_t gc_this_jobmgr; void -simple_zombie_reaper(void *obj __attribute__((unused)), struct kevent *kev) -{ - waitpid(kev->ident, NULL, 0); -} - -void job_ignore(job_t j) { struct semaphoreitem *si; @@ -1779,9 +1769,7 @@ if ((uintptr_t)j == kev->ident || (uintptr_t)&j->start_interval == kev->ident) { job_dispatch(j, true); } else if ((uintptr_t)&j->exit_timeout == kev->ident) { - if (debug_shutdown_hangs) { - job_force_sampletool(j); - } + job_force_sampletool(j); job_log(j, LOG_WARNING, "Exit timeout elapsed (%u seconds). Killing.", j->exit_timeout); job_assumes(j, kill(j->p, SIGKILL) != -1); } else { @@ -3625,16 +3613,72 @@ void job_force_sampletool(job_t j) { - char *sample_args[] = { "sample", NULL, "1", "-mayDie", NULL }; + struct stat sb; + char logfile[PATH_MAX]; char pidstr[100]; + char *sample_args[] = { "sample", pidstr, "1", "-mayDie", "-file", logfile, NULL }; + char *contents = NULL; + int logfile_fd = -1; + int console_fd = -1; pid_t sp; + + if (!debug_shutdown_hangs) { + return; + } snprintf(pidstr, sizeof(pidstr), "%u", j->p); - sample_args[1] = pidstr; + snprintf(logfile, sizeof(logfile), "/var/log/shutdown/%s-%u.sample.txt", j->label, j->p); - if (job_assumes(j, posix_spawnp(&sp, sample_args[0], NULL, NULL, sample_args, environ) == 0)) { - job_assumes(j, kevent_mod(sp, EVFILT_PROC, EV_ADD, NOTE_EXIT, 0, &kqsimple_zombie_reaper) != -1); + job_assumes(j, mkdir("/var/log/shutdown", S_IRWXU) != -1 || errno == EEXIST); + + /* + * This will stall launchd for as long as the 'sample' tool runs. + * + * We didn't give the 'sample' tool a bootstrap port, so it therefore + * can't deadlock against launchd. + */ + if (job_assumes(j, (errno = posix_spawnp(&sp, sample_args[0], NULL, NULL, sample_args, environ)) == 0)) { + int wstatus; + + job_assumes(j, waitpid(sp, &wstatus, 0) != -1); } + + if (!job_assumes(j, (logfile_fd = open(logfile, O_RDONLY|O_NOCTTY)) != -1)) { + goto out; + } + + if (!job_assumes(j, (console_fd = open(_PATH_CONSOLE, O_WRONLY|O_APPEND||O_NOCTTY)) != -1)) { + goto out; + } + + if (!job_assumes(j, fstat(logfile_fd, &sb) != -1)) { + goto out; + } + + contents = malloc(sb.st_size); + + if (!job_assumes(j, contents != NULL)) { + goto out; + } + + if (!job_assumes(j, read(logfile_fd, contents, sb.st_size) == sb.st_size)) { + goto out; + } + + job_assumes(j, write(console_fd, contents, sb.st_size) == sb.st_size); + +out: + if (contents) { + free(contents); + } + + if (logfile_fd != -1) { + job_assumes(j, close(logfile_fd) != -1); + } + + if (console_fd != -1) { + job_assumes(j, close(console_fd) != -1); + } } bool

1 0

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

09 Feb '07

Revision: 23050 http://trac.macosforge.org/projects/launchd/changeset/23050 Author: zarzycki(a)apple.com Date: 2007-02-08 17:51:31 -0800 (Thu, 08 Feb 2007) Log Message: ----------- Performance hack. We really ought to switch to hashes at some point. 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-02-08 23:44:35 UTC (rev 23049) +++ trunk/launchd/src/launchd_core_logic.c 2007-02-09 01:51:31 UTC (rev 23050) @@ -191,7 +191,7 @@ struct jobmgr_s { SLIST_ENTRY(jobmgr_s) sle; SLIST_HEAD(, jobmgr_s) submgrs; - SLIST_HEAD(, job_s) jobs; + TAILQ_HEAD(, job_s) jobs; mach_port_t jm_port; mach_port_t req_port; jobmgr_t parentmgr; @@ -227,7 +227,7 @@ struct job_s { kq_callback kqjob_callback; - SLIST_ENTRY(job_s) sle; + TAILQ_ENTRY(job_s) sle; SLIST_HEAD(, socketgroup) sockets; SLIST_HEAD(, calendarinterval) cal_intervals; SLIST_HEAD(, envitem) global_env; @@ -523,7 +523,7 @@ jobmgr_shutdown(jmi); } - SLIST_FOREACH_SAFE(ji, &jm->jobs, sle, jn) { + TAILQ_FOREACH_SAFE(ji, &jm->jobs, sle, jn) { if (!job_active(ji)) { job_remove(ji); } else if (!ji->hopefully_exits_last) { @@ -551,10 +551,10 @@ } /* We should have one job left and it should be the anonymous job */ - ji = SLIST_FIRST(&jm->jobs); - jobmgr_assumes(jm, ji && ji == jm->anonj && (SLIST_NEXT(ji, sle) == NULL)); + ji = TAILQ_FIRST(&jm->jobs); + jobmgr_assumes(jm, ji && ji == jm->anonj && (TAILQ_NEXT(ji, sle) == NULL)); - while ((ji = SLIST_FIRST(&jm->jobs))) { + while ((ji = TAILQ_FIRST(&jm->jobs))) { job_remove(ji); } @@ -682,7 +682,7 @@ kevent_mod((uintptr_t)j, EVFILT_TIMER, EV_DELETE, 0, 0, NULL); if (job_assumes(j, j->mgr)) { - SLIST_REMOVE(&j->mgr->jobs, j, job_s, sle); + TAILQ_REMOVE(&j->mgr->jobs, j, sle); jobmgr_tickle(j->mgr); } @@ -972,7 +972,7 @@ j->argv[i] = NULL; } - SLIST_INSERT_HEAD(&jm->jobs, j, sle); + TAILQ_INSERT_TAIL(&jm->jobs, j, sle); job_log(j, LOG_DEBUG, "Conceived"); @@ -1493,7 +1493,7 @@ } } - SLIST_FOREACH(ji, &jm->jobs, sle) { + TAILQ_FOREACH(ji, &jm->jobs, sle) { if (strcmp(ji->label, label) == 0) { return ji; } @@ -1514,15 +1514,17 @@ runtime_get_caller_creds(&ldc); - SLIST_FOREACH(ji, &jm->jobs, sle) { + TAILQ_FOREACH(ji, &jm->jobs, sle) { if (ji->p == ldc.pid) { /* This is just a MRU perfomance hack */ - SLIST_REMOVE(&jm->jobs, ji, job_s, sle); - SLIST_INSERT_HEAD(&jm->jobs, ji, sle); + TAILQ_REMOVE(&jm->jobs, ji, sle); + TAILQ_INSERT_HEAD(&jm->jobs, ji, sle); return ji; + } else if (ji->p == 0) { + /* All the PIDs are at the front of the list */ + break; } } - return jm->anonj; } @@ -1534,7 +1536,7 @@ } } - SLIST_FOREACH(ji, &jm->jobs, sle) { + TAILQ_FOREACH(ji, &jm->jobs, sle) { if (ji->j_port == p) { return ji; } @@ -1566,7 +1568,7 @@ } } - SLIST_FOREACH(ji, &jm->jobs, sle) { + TAILQ_FOREACH(ji, &jm->jobs, sle) { SLIST_FOREACH(ms, &ji->machservices, sle) { if (ms->port == p) { return ji; @@ -1592,7 +1594,7 @@ job_export_all2(jmi, where); } - SLIST_FOREACH(ji, &jm->jobs, sle) { + TAILQ_FOREACH(ji, &jm->jobs, sle) { launch_data_t tmp; if (jobmgr_assumes(jm, (tmp = job_export2(ji, false)) != NULL)) { @@ -1636,6 +1638,10 @@ return; } + /* Performance hack */ + TAILQ_REMOVE(&j->mgr->jobs, j, sle); + TAILQ_INSERT_TAIL(&j->mgr->jobs, j, sle); + job_assumes(j, gettimeofday(&tve, NULL) != -1); if (j->wait_reply_port) { @@ -1698,7 +1704,7 @@ jobmgr_dispatch_all(jmi); } - SLIST_FOREACH_SAFE(ji, &jm->jobs, sle, jn) { + TAILQ_FOREACH_SAFE(ji, &jm->jobs, sle, jn) { job_dispatch(ji, false); } } @@ -1889,6 +1895,10 @@ job_start_child(j); break; default: + /* Performance hack */ + TAILQ_REMOVE(&j->mgr->jobs, j, sle); + TAILQ_INSERT_HEAD(&j->mgr->jobs, j, sle); + if (!j->legacy_mach_job) { job_assumes(j, close(oepair[1]) != -1); } @@ -1993,7 +2003,7 @@ jobmgr_setup_env_from_other_jobs(jm->parentmgr); } - SLIST_FOREACH(ji, &jm->jobs, sle) { + TAILQ_FOREACH(ji, &jm->jobs, sle) { SLIST_FOREACH(ei, &ji->global_env, sle) { setenv(ei->key, ei->value, 1); } @@ -2815,7 +2825,7 @@ unsigned int cnt = 0; job_t ji; - SLIST_FOREACH(ji, &j->mgr->jobs, sle) { + TAILQ_FOREACH(ji, &j->mgr->jobs, sle) { if (ji->p) { cnt++; } @@ -3186,13 +3196,13 @@ return jm; } - SLIST_FOREACH(ji, &jm->jobs, sle) { + TAILQ_FOREACH(ji, &jm->jobs, sle) { if (ji->p && !ji->hopefully_exits_last) { return jm; } } - SLIST_FOREACH(ji, &jm->jobs, sle) { + TAILQ_FOREACH(ji, &jm->jobs, sle) { job_stop(ji); } @@ -3215,7 +3225,7 @@ return false; } - SLIST_FOREACH(ji, &jm->jobs, sle) { + TAILQ_FOREACH(ji, &jm->jobs, sle) { if (ji->p) { return false; } @@ -3306,6 +3316,8 @@ return NULL; } + TAILQ_INIT(&jmr->jobs); + jmr->req_port = requestorport; if ((jmr->parentmgr = jm)) { @@ -3378,7 +3390,7 @@ jobmgr_delete_anything_with_port(jmi, port); } - SLIST_FOREACH_SAFE(ji, &jm->jobs, sle, jn) { + TAILQ_FOREACH_SAFE(ji, &jm->jobs, sle, jn) { SLIST_FOREACH_SAFE(ms, &ji->machservices, sle, next_ms) { if (ms->port == port) { machservice_delete(ms); @@ -3393,7 +3405,7 @@ struct machservice *ms; job_t ji; - SLIST_FOREACH(ji, &jm->jobs, sle) { + TAILQ_FOREACH(ji, &jm->jobs, sle) { SLIST_FOREACH(ms, &ji->machservices, sle) { if (strcmp(name, ms->name) == 0) { return ms; @@ -3551,7 +3563,7 @@ } /* We don't need the _SAFE version because we return after the job_dispatch() */ - SLIST_FOREACH(ji, &jm->jobs, sle) { + TAILQ_FOREACH(ji, &jm->jobs, sle) { SLIST_FOREACH(ms, &ji->machservices, sle) { if (ms->port != p) { continue; @@ -3704,7 +3716,7 @@ jobmgr_dispatch_all_semaphores(jmi); } - SLIST_FOREACH_SAFE(ji, &jm->jobs, sle, jn) { + TAILQ_FOREACH_SAFE(ji, &jm->jobs, sle, jn) { if (!SLIST_EMPTY(&ji->semaphores)) { job_dispatch(ji, false); } @@ -4027,7 +4039,7 @@ *up_cont = MACH_PORT_NULL; - SLIST_FOREACH(ji, &root_jobmgr->jobs, sle) { + TAILQ_FOREACH(ji, &root_jobmgr->jobs, sle) { if (ji->mach_uid != which_user) { continue; } @@ -4248,7 +4260,7 @@ jm = j->mgr; - SLIST_FOREACH(ji, &jm->jobs, sle) { + TAILQ_FOREACH(ji, &jm->jobs, sle) { SLIST_FOREACH(ms, &ji->machservices, sle) { cnt++; } @@ -4268,7 +4280,7 @@ goto out_bad; } - SLIST_FOREACH(ji, &jm->jobs, sle) { + TAILQ_FOREACH(ji, &jm->jobs, sle) { SLIST_FOREACH(ms, &ji->machservices, sle) { strlcpy(service_names[cnt2], machservice_name(ms), sizeof(service_names[0])); service_actives[cnt2] = machservice_status(ms); @@ -4312,8 +4324,8 @@ } if (job_assumes(j, jmi != NULL)) { - SLIST_REMOVE(&j->mgr->jobs, j, job_s, sle); - SLIST_INSERT_HEAD(&jmi->jobs, j, sle); + TAILQ_REMOVE(&j->mgr->jobs, j, sle); + TAILQ_INSERT_TAIL(&jmi->jobs, j, sle); j->mgr = jmi; } } @@ -4651,7 +4663,7 @@ launchd_assert((root_jobmgr = jobmgr_new(NULL, mach_task_self(), checkin_port)) != NULL); - SLIST_FOREACH(ji, &root_jobmgr->jobs, sle) { + TAILQ_FOREACH(ji, &root_jobmgr->jobs, sle) { if (ji->anonymous) { anon_job = ji; break;

1 0

[23049] trunk/launchd/src/launchd_core_logic.c
by source_changes＠macosforge.org 08 Feb '07

08 Feb '07

Revision: 23049 http://trac.macosforge.org/projects/launchd/changeset/23049 Author: zarzycki(a)apple.com Date: 2007-02-08 15:44:35 -0800 (Thu, 08 Feb 2007) Log Message: ----------- Get rid of a false 'Bug' log message. 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-02-08 22:48:29 UTC (rev 23048) +++ trunk/launchd/src/launchd_core_logic.c 2007-02-08 23:44:35 UTC (rev 23049) @@ -789,7 +789,8 @@ free(argv); - if (!job_assumes(j, jr != NULL)) { + /* jobs can easily be denied creation during shutdown */ + if (!jr) { goto out_bad; }

1 0