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

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

08 Feb '07

Revision: 23048 http://trac.macosforge.org/projects/launchd/changeset/23048 Author: zarzycki(a)apple.com Date: 2007-02-08 14:48:29 -0800 (Thu, 08 Feb 2007) Log Message: ----------- Symbol clean up. Modified Paths: -------------- trunk/launchd/src/launchd_core_logic.c trunk/launchd/src/launchd_core_logic.h Modified: trunk/launchd/src/launchd_core_logic.c =================================================================== --- trunk/launchd/src/launchd_core_logic.c 2007-02-08 22:43:27 UTC (rev 23047) +++ trunk/launchd/src/launchd_core_logic.c 2007-02-08 22:48:29 UTC (rev 23048) @@ -209,6 +209,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_remove(jobmgr_t jm); static void jobmgr_dispatch_all(jobmgr_t jm); static job_t jobmgr_new_anonymous(jobmgr_t jm); static job_t job_mig_intran2(jobmgr_t jm, mach_port_t p); Modified: trunk/launchd/src/launchd_core_logic.h =================================================================== --- trunk/launchd/src/launchd_core_logic.h 2007-02-08 22:43:27 UTC (rev 23047) +++ trunk/launchd/src/launchd_core_logic.h 2007-02-08 22:48:29 UTC (rev 23048) @@ -37,7 +37,6 @@ job_t jobmgr_find(jobmgr_t jm, const char *label); void jobmgr_delete_anything_with_port(jobmgr_t jm, mach_port_t port); bool jobmgr_ack_port_destruction(jobmgr_t jm, mach_port_t p); -void jobmgr_remove(jobmgr_t jm); job_t jobmgr_find_by_service_port(jobmgr_t jm, mach_port_t p); launch_data_t job_export_all(void);

1 0

[23047] tags/launchd-193/
by source_changes＠macosforge.org 08 Feb '07

08 Feb '07

Revision: 23047 http://trac.macosforge.org/projects/launchd/changeset/23047 Author: zarzycki(a)apple.com Date: 2007-02-08 14:43:27 -0800 (Thu, 08 Feb 2007) Log Message: ----------- "Tagging launchd-193 from https://svn.macosforge.org/repository/launchd/trunk" Added Paths: ----------- tags/launchd-193/ Copied: tags/launchd-193 (from rev 23046, trunk)

1 0

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

08 Feb '07

Revision: 23046 http://trac.macosforge.org/projects/launchd/changeset/23046 Author: zarzycki(a)apple.com Date: 2007-02-08 14:39:50 -0800 (Thu, 08 Feb 2007) Log Message: ----------- More shutdown logic clean up and sanity checking. 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-02-08 18:04:06 UTC (rev 23045) +++ trunk/launchd/src/launchd_core_logic.c 2007-02-08 22:39:50 UTC (rev 23046) @@ -516,6 +516,8 @@ jobmgr_t jmi, jmn; job_t ji, jn; + jobmgr_log(jm, LOG_DEBUG, "Beginning job manager shutdown"); + SLIST_FOREACH_SAFE(jmi, &jm->submgrs, sle, jmn) { jobmgr_shutdown(jmi); } @@ -539,18 +541,22 @@ jobmgr_t jmi; job_t ji; - while ((jmi = SLIST_FIRST(&jm->submgrs))) { - jobmgr_remove(jmi); + jobmgr_log(jm, LOG_DEBUG, "Removed job manager"); + + if (!jobmgr_assumes(jm, SLIST_EMPTY(&jm->submgrs))) { + while ((jmi = SLIST_FIRST(&jm->submgrs))) { + jobmgr_remove(jmi); + } } + /* 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)); + while ((ji = SLIST_FIRST(&jm->jobs))) { job_remove(ji); } - if (jm->parentmgr) { - SLIST_REMOVE(&jm->parentmgr->submgrs, jm, jobmgr_s, sle); - } - if (jm->req_port) { jobmgr_assumes(jm, launchd_mport_deallocate(jm->req_port) == KERN_SUCCESS); } @@ -570,6 +576,11 @@ if (jm->jm_stderr) { free(jm->jm_stderr); } + + if (jm->parentmgr) { + SLIST_REMOVE(&jm->parentmgr->submgrs, jm, jobmgr_s, sle); + jobmgr_tickle(jm->parentmgr); + } free(jm); } @@ -590,20 +601,16 @@ job_set_global_on_demand(j, false); } - if (j->p && !j->anonymous) { - if (kevent_mod(j->p, EVFILT_PROC, EV_ADD, NOTE_EXIT, 0, &kqsimple_zombie_reaper) == -1) { - job_reap(j); - } else { - /* we've attached the simple zombie reaper, we're going to delete the job before it is dead */ - job_stop(j); - } + if (!job_assumes(j, j->p == 0)) { + job_assumes(j, kill(j->p, SIGKILL) != -1); + job_reap(j); } - if (j->forkfd) { + if (!job_assumes(j, j->forkfd == 0)) { job_assumes(j, close(j->forkfd) != -1); } - if (j->log_redirect_fd) { + if (!job_assumes(j, j->log_redirect_fd == 0)) { job_assumes(j, close(j->log_redirect_fd) != -1); } @@ -2803,7 +2810,16 @@ job_log(j, LOG_INFO, "Exited. Was only configured to run once."); return true; } else if (j->mgr->shutting_down) { - job_log(j, LOG_INFO, "Exited while shutdown in progress."); + unsigned int cnt = 0; + job_t ji; + + SLIST_FOREACH(ji, &j->mgr->jobs, sle) { + if (ji->p) { + cnt++; + } + } + + job_log(j, LOG_INFO, "Exited while shutdown in progress. Processes remaining: %u", cnt); return true; } else if (!j->checkedin && (!SLIST_EMPTY(&j->sockets) || !SLIST_EMPTY(&j->machservices))) { job_log(j, LOG_WARNING, "Failed to check-in!"); @@ -3193,6 +3209,10 @@ { job_t ji; + if (!SLIST_EMPTY(&jm->submgrs)) { + return false; + } + SLIST_FOREACH(ji, &jm->jobs, sle) { if (ji->p) { return false; @@ -3320,6 +3340,8 @@ jobmgr_assumes(jmr, jmr->anonj != NULL); + jobmgr_log(jmr, LOG_DEBUG, "Created job manager"); + return jmr; out_bad: Modified: trunk/launchd/src/launchd_runtime.c =================================================================== --- trunk/launchd/src/launchd_runtime.c 2007-02-08 18:04:06 UTC (rev 23045) +++ trunk/launchd/src/launchd_runtime.c 2007-02-08 22:39:50 UTC (rev 23046) @@ -35,6 +35,7 @@ #include <mach/mach_host.h> #include <mach/exception.h> #include <sys/types.h> +#include <sys/stat.h> #include <sys/time.h> #include <sys/event.h> #include <sys/queue.h> @@ -578,7 +579,7 @@ /* XXX - So very gross */ if (gc_this_jobmgr) { - jobmgr_remove(gc_this_jobmgr); + jobmgr_shutdown(gc_this_jobmgr); gc_this_jobmgr = NULL; } @@ -674,7 +675,9 @@ pthread_mutex_lock(&ourlock); if (ourlogfile == NULL) { + rename("/var/log/launchd_raw.log", "/var/log/launchd_raw-old.log"); ourlogfile = fopen("/var/log/launchd_raw.log", "a"); + chmod("/var/log/launchd_raw.log", DEFFILEMODE); } pthread_mutex_unlock(&ourlock);

1 0

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

08 Feb '07

Revision: 23045 http://trac.macosforge.org/projects/launchd/changeset/23045 Author: zarzycki(a)apple.com Date: 2007-02-08 10:04:06 -0800 (Thu, 08 Feb 2007) Log Message: ----------- Dead code deletion. Modified Paths: -------------- trunk/launchd/src/launchd.8 trunk/launchd/src/launchd.c trunk/launchd/src/launchd.h trunk/launchd/src/launchd_core_logic.c Modified: trunk/launchd/src/launchd.8 =================================================================== --- trunk/launchd/src/launchd.8 2007-02-08 17:26:17 UTC (rev 23044) +++ trunk/launchd/src/launchd.8 2007-02-08 18:04:06 UTC (rev 23045) @@ -37,14 +37,10 @@ is invoked by the kernel to run as the first process on the system and to further bootstrap the rest of the system. .Sh OPTIONS .Bl -tag -width -indent -.It Fl d -Daemonize. Useful when passing a command to launchd on the command line. .It Fl D Debug. Prints syslog messages to stderr and adjusts logging via .Xr syslog 3 to LOG_DEBUG. -.It Fl S Ar SessionType -Instruct launchd to which session type it is. .El .Sh OPTIONS WHEN RUN AS PID 1 .Bl -tag -width -indent Modified: trunk/launchd/src/launchd.c =================================================================== --- trunk/launchd/src/launchd.c 2007-02-08 17:26:17 UTC (rev 23044) +++ trunk/launchd/src/launchd.c 2007-02-08 18:04:06 UTC (rev 23045) @@ -83,12 +83,10 @@ extern char **environ; static void signal_callback(void *, struct kevent *); -static void ppidexit_callback(void); static void debugshutdown_callback(void); static void pfsystem_callback(void *, struct kevent *); static kq_callback kqsignal_callback = signal_callback; -static kq_callback kqppidexit_callback = (kq_callback)ppidexit_callback; static kq_callback kqdebugshutdown_callback = (kq_callback)debugshutdown_callback; static kq_callback kqpfsystem_callback = pfsystem_callback; @@ -123,17 +121,15 @@ SIGTTIN, SIGTTOU, SIGIO, SIGXCPU, SIGXFSZ, SIGVTALRM, SIGPROF, SIGWINCH, SIGINFO, SIGUSR1, SIGUSR2 }; - bool sflag = false, dflag = false, Dflag = false; + bool sflag = false, Dflag = false; char ldconf[PATH_MAX] = PID1LAUNCHD_CONF; const char *h = getenv("HOME"); - const char *session_type = NULL; const char *optargs = NULL; - job_t fbj = NULL; struct stat sb; size_t i, checkin_fdcnt = 0; int *checkin_fds = NULL; mach_port_t checkin_mport = MACH_PORT_NULL; - int ch, ker, logopts; + int ch, logopts; testfd_or_openfd(STDIN_FILENO, _PATH_DEVNULL, O_RDONLY); testfd_or_openfd(STDOUT_FILENO, _PATH_DEVNULL, O_WRONLY); @@ -200,14 +196,12 @@ if (getpid() == 1) { optargs = "s"; } else { - optargs = "DS:dh"; + optargs = "Dh"; } while ((ch = getopt(argc, argv, optargs)) != -1) { switch (ch) { - case 'S': session_type = optarg; break; /* what type of session we're creating */ case 'D': Dflag = true; break; /* debug */ - case 'd': dflag = true; break; /* daemonize */ case 's': sflag = true; break; /* single user */ case 'h': usage(stdout); break; /* help */ case '?': /* we should do something with the global optopt variable here */ @@ -222,10 +216,6 @@ /* main phase three: get the party started */ - if (dflag) { - launchd_assumes(daemon(0, 0) == 0); - } - logopts = LOG_PID|LOG_CONS; if (Dflag) { logopts |= LOG_PERROR; @@ -254,10 +244,6 @@ rlcj = job_new(root_jobmgr, READCONF_LABEL, NULL, launchctl_bootstrap_tool, ldconf); launchd_assert(rlcj != NULL); - if (argv[0]) { - fbj = job_new(root_jobmgr, FIRSTBORN_LABEL, NULL, (const char *const *)argv, NULL); - } - if (NULL == getenv("PATH")) { setenv("PATH", _PATH_STDPATH, 1); } @@ -270,27 +256,6 @@ monitor_networking_state(); - if (session_type) { - pid_t pp = getppid(); - - /* As a per session launchd, we need to exit if our parent dies. - * - * Normally, in Unix, SIGHUP would cause us to exit, but we're a - * daemon, and daemons use SIGHUP to signal the need to reread - * configuration files. "Weee." - */ - - if (pp == 1) { - exit(EXIT_SUCCESS); - } - - ker = kevent_mod(pp, EVFILT_PROC, EV_ADD, NOTE_EXIT, 0, &kqppidexit_callback); - - if (ker == -1) { - exit(launchd_assumes(errno == ESRCH) ? EXIT_SUCCESS : EXIT_FAILURE); - } - } - /* * We cannot stat() anything in the home directory right now. * @@ -304,10 +269,6 @@ rlcj = job_dispatch(rlcj, true); } - if (fbj) { - fbj = job_dispatch(fbj, true); - } - char *doom_why = "at instruction"; switch (setjmp(doom_doom_doom)) { case 0: @@ -431,17 +392,6 @@ } void -ppidexit_callback(void) -{ - syslog(LOG_INFO, "Parent process exited"); - - launchd_shutdown(); - - /* Let's just bail for now. We should really try to wait for jobs to exit first. */ - exit(EXIT_SUCCESS); -} - -void launchd_shutdown(void) { if (shutdown_in_progress) { Modified: trunk/launchd/src/launchd.h =================================================================== --- trunk/launchd/src/launchd.h 2007-02-08 17:26:17 UTC (rev 23044) +++ trunk/launchd/src/launchd.h 2007-02-08 18:04:06 UTC (rev 23045) @@ -26,7 +26,6 @@ #include "libbootstrap_public.h" #include "launchd_runtime.h" -#define FIRSTBORN_LABEL "com.apple.launchd.firstborn" #define READCONF_LABEL "com.apple.launchd.readconfig" struct kevent; Modified: trunk/launchd/src/launchd_core_logic.c =================================================================== --- trunk/launchd/src/launchd_core_logic.c 2007-02-08 17:26:17 UTC (rev 23044) +++ trunk/launchd/src/launchd_core_logic.c 2007-02-08 18:04:06 UTC (rev 23045) @@ -263,10 +263,9 @@ time_t start_time; time_t min_run_time; unsigned int start_interval; - unsigned int checkedin:1, firstborn:1, debug:1, inetcompat:1, inetcompat_wait:1, + unsigned int checkedin:1, anonymous:1, debug:1, inetcompat:1, inetcompat_wait:1, ondemand:1, session_create:1, low_pri_io:1, no_init_groups:1, priv_port_has_senders:1, - importing_global_env:1, importing_hard_limits:1, setmask:1, legacy_mach_job:1, runatload:1, - anonymous:1; + 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; @@ -926,7 +925,6 @@ j->currently_ignored = true; j->ondemand = true; j->checkedin = true; - j->firstborn = (strcmp(label, FIRSTBORN_LABEL) == 0); if (prog) { j->prog = strdup(prog); @@ -1760,13 +1758,7 @@ switch (kev->filter) { case EVFILT_PROC: job_reap(j); - - if (j->firstborn) { - job_log(j, LOG_DEBUG, "first born died, begin shutdown"); - launchd_shutdown(); - } else { - job_dispatch(j, false); - } + job_dispatch(j, false); break; case EVFILT_TIMER: if ((uintptr_t)j == kev->ident || (uintptr_t)&j->start_interval == kev->ident) { @@ -1879,14 +1871,6 @@ job_assumes(j, close(execspair[0]) == 0); /* wait for our parent to say they've attached a kevent to us */ read(_fd(execspair[1]), &c, sizeof(c)); - if (j->firstborn) { - setpgid(getpid(), getpid()); - if (isatty(STDIN_FILENO)) { - if (tcsetpgrp(STDIN_FILENO, getpid()) == -1) { - job_log_error(j, LOG_WARNING, "tcsetpgrp()"); - } - } - } if (sipc) { job_assumes(j, close(spair[0]) == 0);

1 0

[23044] trunk/launchd/src/StartupItems
by source_changes＠macosforge.org 08 Feb '07

08 Feb '07

Revision: 23044 http://trac.macosforge.org/projects/launchd/changeset/23044 Author: zarzycki(a)apple.com Date: 2007-02-08 09:26:17 -0800 (Thu, 08 Feb 2007) Log Message: ----------- Christopher Ryan says that I can remove this right away. Removed Paths: ------------- trunk/launchd/src/StartupItems/AppleShare trunk/launchd/src/StartupItems/AppleShare.plist Deleted: trunk/launchd/src/StartupItems/AppleShare =================================================================== --- trunk/launchd/src/StartupItems/AppleShare 2007-02-08 15:34:54 UTC (rev 23043) +++ trunk/launchd/src/StartupItems/AppleShare 2007-02-08 17:26:17 UTC (rev 23044) @@ -1,29 +0,0 @@ -#!/bin/sh - -## -# Apple File Protocol -## - -[ -f /System/Library/LaunchDaemons/com.apple.AppleFileServer.plist ] && exit 0 - -. /etc/rc.common - -StartService () -{ - if [ "${AFPSERVER:=-NO-}" = "-YES-" ]; then - echo "Starting Apple File Service" - /usr/sbin/AppleFileServer - fi -} - -StopService () -{ - return 0 -} - -RestartService () -{ - return 0 -} - -RunService "$1" Deleted: trunk/launchd/src/StartupItems/AppleShare.plist =================================================================== --- trunk/launchd/src/StartupItems/AppleShare.plist 2007-02-08 15:34:54 UTC (rev 23043) +++ trunk/launchd/src/StartupItems/AppleShare.plist 2007-02-08 17:26:17 UTC (rev 23044) @@ -1,5 +0,0 @@ -{ - Description = "Apple File Service"; - Provides = ("Apple File Service"); - Requires = ("Disks"); -}

1 0

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

08 Feb '07

Revision: 23043 http://trac.macosforge.org/projects/launchd/changeset/23043 Author: zarzycki(a)apple.com Date: 2007-02-08 07:34:54 -0800 (Thu, 08 Feb 2007) Log Message: ----------- <rdar://problem/4983556> Shutdown sampling is holding up system shutdown Modified Paths: -------------- trunk/launchd/src/shutdown_debugger.c Modified: trunk/launchd/src/shutdown_debugger.c =================================================================== --- trunk/launchd/src/shutdown_debugger.c 2007-02-08 15:21:26 UTC (rev 23042) +++ trunk/launchd/src/shutdown_debugger.c 2007-02-08 15:34:54 UTC (rev 23043) @@ -33,6 +33,7 @@ static void populate_proc_list(void); static void debug_machports(pid_t pid, const char *pname); static void debug_machports2(pid_t pid, FILE *where); +static void do_stackshot(void); static int kq; @@ -70,6 +71,8 @@ closedir(thedir); + do_stackshot(); + assert((kq = kqueue()) != -1); debug_machports(1, "launchd"); @@ -524,3 +527,11 @@ fprintf(where, "Finished.\n"); return; } + +void +do_stackshot(void) +{ + /* yes, we really mean to exec without fork at this point in time */ + execl("/usr/libexec/stackshot", "/usr/libexec/stackshot", "-i", "-f", "./shutdown-stackshot.log", NULL); + _exit(EXIT_FAILURE); +}

1 0

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

08 Feb '07

Revision: 23042 http://trac.macosforge.org/projects/launchd/changeset/23042 Author: zarzycki(a)apple.com Date: 2007-02-08 07:21:26 -0800 (Thu, 08 Feb 2007) Log Message: ----------- <rdar://problem/4943031> Add plist option to mimic the kernel's KERN_PROCDELAYTERM Modified Paths: -------------- trunk/launchd/src/launchd.c trunk/launchd/src/launchd.h trunk/launchd/src/launchd.plist.5 trunk/launchd/src/launchd_core_logic.c trunk/launchd/src/launchd_core_logic.h trunk/launchd/src/liblaunch_public.h Modified: trunk/launchd/src/launchd.c =================================================================== --- trunk/launchd/src/launchd.c 2007-02-08 01:28:03 UTC (rev 23041) +++ trunk/launchd/src/launchd.c 2007-02-08 15:21:26 UTC (rev 23042) @@ -110,7 +110,7 @@ static const char *launchctl_bootstrap_tool[] = { "/bin/launchctl", /* "bootstrap", */ NULL }; sigset_t blocked_signals = 0; -bool shutdown_in_progress = false; +static bool shutdown_in_progress = false; bool debug_shutdown_hangs = false; bool network_up = false; int batch_disabler_count = 0; @@ -469,7 +469,7 @@ rlcj = NULL; - jobmgr_remove_all_inactive(root_jobmgr); + root_jobmgr = jobmgr_shutdown(root_jobmgr); } void @@ -676,7 +676,7 @@ void launchd_post_kevent(void) { - if (shutdown_in_progress && jobmgr_is_idle(root_jobmgr)) { + if (shutdown_in_progress && (!root_jobmgr || jobmgr_is_idle(root_jobmgr))) { shutdown_in_progress = false; if (getpid() == 1) { Modified: trunk/launchd/src/launchd.h =================================================================== --- trunk/launchd/src/launchd.h 2007-02-08 01:28:03 UTC (rev 23041) +++ trunk/launchd/src/launchd.h 2007-02-08 15:21:26 UTC (rev 23042) @@ -34,7 +34,6 @@ extern kq_callback kqsimple_zombie_reaper; extern sigset_t blocked_signals; -extern bool shutdown_in_progress; extern bool debug_shutdown_hangs; extern bool network_up; extern int batch_disabler_count; Modified: trunk/launchd/src/launchd.plist.5 =================================================================== --- trunk/launchd/src/launchd.plist.5 2007-02-08 01:28:03 UTC (rev 23041) +++ trunk/launchd/src/launchd.plist.5 2007-02-08 15:21:26 UTC (rev 23042) @@ -271,6 +271,12 @@ This optional key specifies what .Xr nice 3 value should be applied to the daemon. +.It Sy HopefullyExitsLast <boolean> +This optional key causes programs to exit in a second wave during system +shutdown. This key exists because some jobs don't reference count their +clients, and therefore do not know when it is safe to exit. The use of this key +should be considered a temporary solution until the software can be changed to +properly reference count clients. .It Sy LowPriorityIO <boolean> This optional key specifies whether the kernel should consider this daemon to be low priority when doing file system I/O. .It Sy LaunchOnlyOnce <boolean> Modified: trunk/launchd/src/launchd_core_logic.c =================================================================== --- trunk/launchd/src/launchd_core_logic.c 2007-02-08 01:28:03 UTC (rev 23041) +++ trunk/launchd/src/launchd_core_logic.c 2007-02-08 15:21:26 UTC (rev 23042) @@ -199,7 +199,7 @@ char *jm_stdout; char *jm_stderr; unsigned int global_on_demand_cnt; - unsigned int transfer_bstrap:1; + unsigned int transfer_bstrap:1, sent_stop_to_hopeful_jobs:1, shutting_down:1; char name[0]; }; @@ -208,6 +208,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_dispatch_all(jobmgr_t jm); static job_t jobmgr_new_anonymous(jobmgr_t jm); static job_t job_mig_intran2(jobmgr_t jm, mach_port_t p); @@ -268,7 +269,7 @@ anonymous: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; + currently_ignored:1, forced_peers_to_demand_mode:1, setnice:1, hopefully_exits_last:1; char label[0]; }; @@ -510,23 +511,27 @@ return r; } -void -jobmgr_remove_all_inactive(jobmgr_t jm) +jobmgr_t +jobmgr_shutdown(jobmgr_t jm) { jobmgr_t jmi, jmn; job_t ji, jn; SLIST_FOREACH_SAFE(jmi, &jm->submgrs, sle, jmn) { - jobmgr_remove_all_inactive(jmi); + jobmgr_shutdown(jmi); } SLIST_FOREACH_SAFE(ji, &jm->jobs, sle, jn) { if (!job_active(ji)) { job_remove(ji); - } else { + } else if (!ji->hopefully_exits_last) { job_stop(ji); } } + + jm->shutting_down = true; + + return jobmgr_tickle(jm); } void @@ -595,10 +600,6 @@ } } - if (job_assumes(j, j->mgr)) { - SLIST_REMOVE(&j->mgr->jobs, j, job_s, sle); - } - if (j->forkfd) { job_assumes(j, close(j->forkfd) != -1); } @@ -672,6 +673,12 @@ } 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); + jobmgr_tickle(j->mgr); + } + free(j); } @@ -894,7 +901,7 @@ int i, cc = 0; job_t j; - if (shutdown_in_progress) { + if (jm->shutting_down) { errno = EINVAL; return NULL; } @@ -1036,6 +1043,12 @@ j->debug = value; } break; + case 'h': + case 'H': + if (strcasecmp(key, LAUNCH_JOBKEY_HOPEFULLYEXITSLAST) == 0) { + j->hopefully_exits_last = value; + } + break; case 's': case 'S': if (strcasecmp(key, LAUNCH_JOBKEY_SESSIONCREATE) == 0) { @@ -2805,7 +2818,7 @@ } job_log(j, LOG_INFO, "Exited. Was only configured to run once."); return true; - } else if (shutdown_in_progress) { + } else if (j->mgr->shutting_down) { job_log(j, LOG_INFO, "Exited while shutdown in progress."); return true; } else if (!j->checkedin && (!SLIST_EMPTY(&j->sockets) || !SLIST_EMPTY(&j->machservices))) { @@ -3162,6 +3175,35 @@ } } +jobmgr_t +jobmgr_tickle(jobmgr_t jm) +{ + job_t ji; + + if (jm->sent_stop_to_hopeful_jobs || !jm->shutting_down) { + return jm; + } + + SLIST_FOREACH(ji, &jm->jobs, sle) { + if (ji->p && !ji->hopefully_exits_last) { + return jm; + } + } + + SLIST_FOREACH(ji, &jm->jobs, sle) { + job_stop(ji); + } + + jm->sent_stop_to_hopeful_jobs = true; + + if (jobmgr_is_idle(jm)) { + jobmgr_remove(jm); + return NULL; + } + + return jm; +} + bool jobmgr_is_idle(jobmgr_t jm) { @@ -3321,11 +3363,7 @@ */ if (jm->req_port == port) { - if (jm == root_jobmgr) { - launchd_shutdown(); - } else { - return jobmgr_remove(jm); - } + jobmgr_shutdown(jm); } SLIST_FOREACH_SAFE(jmi, &jm->submgrs, sle, jmn) { Modified: trunk/launchd/src/launchd_core_logic.h =================================================================== --- trunk/launchd/src/launchd_core_logic.h 2007-02-08 01:28:03 UTC (rev 23041) +++ trunk/launchd/src/launchd_core_logic.h 2007-02-08 15:21:26 UTC (rev 23042) @@ -32,7 +32,7 @@ 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); -void jobmgr_remove_all_inactive(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); void jobmgr_delete_anything_with_port(jobmgr_t jm, mach_port_t port); Modified: trunk/launchd/src/liblaunch_public.h =================================================================== --- trunk/launchd/src/liblaunch_public.h 2007-02-08 01:28:03 UTC (rev 23041) +++ trunk/launchd/src/liblaunch_public.h 2007-02-08 15:21:26 UTC (rev 23042) @@ -78,6 +78,7 @@ #define LAUNCH_JOBKEY_USERENVIRONMENTVARIABLES "UserEnvironmentVariables" #define LAUNCH_JOBKEY_UMASK "Umask" #define LAUNCH_JOBKEY_NICE "Nice" +#define LAUNCH_JOBKEY_HOPEFULLYEXITSLAST "HopefullyExitsLast" #define LAUNCH_JOBKEY_LOWPRIORITYIO "LowPriorityIO" #define LAUNCH_JOBKEY_SESSIONCREATE "SessionCreate" #define LAUNCH_JOBKEY_SOFTRESOURCELIMITS "SoftResourceLimits"

1 0

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

08 Feb '07

Revision: 23041 http://trac.macosforge.org/projects/launchd/changeset/23041 Author: zarzycki(a)apple.com Date: 2007-02-07 17:28:03 -0800 (Wed, 07 Feb 2007) Log Message: ----------- With this change, you can now: "sudo kill -TERM 1" and the machine will gracefully power off. Modified Paths: -------------- trunk/launchd/src/launchd.c Modified: trunk/launchd/src/launchd.c =================================================================== --- trunk/launchd/src/launchd.c 2007-02-07 23:39:58 UTC (rev 23040) +++ trunk/launchd/src/launchd.c 2007-02-08 01:28:03 UTC (rev 23041) @@ -41,6 +41,7 @@ #include <sys/ioctl.h> #include <sys/mount.h> #include <sys/kern_event.h> +#include <sys/reboot.h> #include <net/if.h> #include <netinet/in.h> #include <netinet/in_var.h> @@ -678,12 +679,14 @@ if (shutdown_in_progress && jobmgr_is_idle(root_jobmgr)) { shutdown_in_progress = false; - if (getpid() != 1) { + if (getpid() == 1) { + if (re_exec_in_single_user_mode) { + 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); - } else if (re_exec_in_single_user_mode) { - re_exec_in_single_user_mode = false; - kill(-1, SIGKILL); /* One last time, just to clear the room */ - launchd_assumes(execl("/sbin/launchd", "/sbin/launchd", "-s", NULL) != -1); } } if (getpid() == 1) {

1 0

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

07 Feb '07

Revision: 23040 http://trac.macosforge.org/projects/launchd/changeset/23040 Author: zarzycki(a)apple.com Date: 2007-02-07 15:39:58 -0800 (Wed, 07 Feb 2007) Log Message: ----------- Add a per job exit timeout. Modified Paths: -------------- trunk/launchd/src/launchd.plist.5 trunk/launchd/src/launchd_core_logic.c trunk/launchd/src/liblaunch_public.h Modified: trunk/launchd/src/launchd.plist.5 =================================================================== --- trunk/launchd/src/launchd.plist.5 2007-02-07 21:07:49 UTC (rev 23039) +++ trunk/launchd/src/launchd.plist.5 2007-02-07 23:39:58 UTC (rev 23040) @@ -176,6 +176,10 @@ The recommended idle time out (in seconds) to pass to the job. If no value is specified, a default time out will be supplied by .Nm launchd for use by the job at check in time. +.It Sy ExitTimeOut <integer> +The amount of time +.Nm launchd +waits before sending a SIGKILL signal. The default value is 20 seconds. The value zero is interpreted as infinity. .It Sy ThrottleInterval <integer> This key lets one override the default throttling policy imposed on jobs by .Nm launchd . Modified: trunk/launchd/src/launchd_core_logic.c =================================================================== --- trunk/launchd/src/launchd_core_logic.c 2007-02-07 21:07:49 UTC (rev 23039) +++ trunk/launchd/src/launchd_core_logic.c 2007-02-07 23:39:58 UTC (rev 23040) @@ -87,6 +87,7 @@ #define LAUNCHD_MIN_JOB_RUN_TIME 10 #define LAUNCHD_ADVISABLE_IDLE_TIMEOUT 30 +#define LAUNCHD_DEFAULT_EXIT_TIMEOUT 20 extern char **environ; @@ -254,8 +255,10 @@ int forkfd; int log_redirect_fd; int nice; - int timeout; + unsigned int timeout; + unsigned int exit_timeout; int stdout_err_fd; + struct timeval sent_sigterm_time; time_t start_time; time_t min_run_time; unsigned int start_interval; @@ -405,6 +408,11 @@ { if (j->p) { job_assumes(j, kill(j->p, SIGTERM) != -1); + job_assumes(j, gettimeofday(&j->sent_sigterm_time, NULL) != -1); + if (j->exit_timeout) { + job_assumes(j, kevent_mod((uintptr_t)&j->exit_timeout, EVFILT_TIMER, + EV_ADD|EV_ONESHOT, NOTE_SECONDS, j->exit_timeout, j) != -1); + } } } @@ -516,9 +524,6 @@ if (!job_active(ji)) { job_remove(ji); } else { - if (debug_shutdown_hangs) { - job_assumes(ji, kevent_mod((uintptr_t)ji, EVFILT_TIMER, EV_ADD|EV_ONESHOT, NOTE_SECONDS, 8, ji) != -1); - } job_stop(ji); } } @@ -662,6 +667,9 @@ if (j->start_interval) { job_assumes(j, kevent_mod((uintptr_t)&j->start_interval, EVFILT_TIMER, EV_DELETE, 0, 0, NULL) != -1); } + if (j->exit_timeout) { + kevent_mod((uintptr_t)&j->exit_timeout, EVFILT_TIMER, EV_DELETE, 0, 0, NULL); + } kevent_mod((uintptr_t)j, EVFILT_TIMER, EV_DELETE, 0, 0, NULL); free(j); @@ -907,6 +915,7 @@ j->mgr = jm; j->min_run_time = LAUNCHD_MIN_JOB_RUN_TIME; j->timeout = LAUNCHD_ADVISABLE_IDLE_TIMEOUT; + j->exit_timeout = LAUNCHD_DEFAULT_EXIT_TIMEOUT; j->currently_ignored = true; j->ondemand = true; j->checkedin = true; @@ -1162,6 +1171,16 @@ job_import_integer(job_t j, const char *key, long long value) { switch (key[0]) { + case 'e': + case 'E': + if (strcasecmp(key, LAUNCH_JOBKEY_EXITTIMEOUT) == 0) { + if (value < 0) { + job_log(j, LOG_WARNING, "Exit timeout less zero. Ignoring."); + } else { + j->exit_timeout = value; + } + } + break; case 'n': case 'N': if (strcasecmp(key, LAUNCH_JOBKEY_NICE) == 0) { @@ -1577,6 +1596,7 @@ void job_reap(job_t j) { + struct timeval tve, tvd; struct rusage ru; int status; @@ -1596,12 +1616,24 @@ return; } + job_assumes(j, gettimeofday(&tve, NULL) != -1); + if (j->wait_reply_port) { job_log(j, LOG_DEBUG, "MPM wait reply being sent"); job_assumes(j, job_mig_wait_reply(j->wait_reply_port, 0, status) == 0); j->wait_reply_port = MACH_PORT_NULL; } + if (j->sent_sigterm_time.tv_sec) { + double delta; + + timersub(&tve, &j->sent_sigterm_time, &tvd); + + delta = (double)tvd.tv_sec + (double)tvd.tv_usec / (double)1000000; + + job_log(j, tvd.tv_sec ? LOG_NOTICE : LOG_INFO, "Exited %f seconds after SIGTERM was sent", delta); + } + timeradd(&ru.ru_utime, &j->ru.ru_utime, &j->ru.ru_utime); timeradd(&ru.ru_stime, &j->ru.ru_stime, &j->ru.ru_stime); j->ru.ru_maxrss += ru.ru_maxrss; @@ -1724,14 +1756,14 @@ } break; case EVFILT_TIMER: - if ((uintptr_t)j == kev->ident) { - if (j->p && job_assumes(j, debug_shutdown_hangs)) { + 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); - } else { - job_dispatch(j, true); } - } else if ((uintptr_t)&j->start_interval == kev->ident) { - job_dispatch(j, true); + job_log(j, LOG_WARNING, "Exit timeout elapsed (%u seconds). Killing.", j->exit_timeout); + job_assumes(j, kill(j->p, SIGKILL) != -1); } else { calendarinterval_callback(j, kev); } @@ -1788,6 +1820,9 @@ job_log(j, LOG_DEBUG, "Starting"); + j->sent_sigterm_time.tv_sec = 0; + j->sent_sigterm_time.tv_usec = 0; + /* FIXME, using stdinpath is a hack for re-reading the conf file */ if (j->stdinpath) { sipc = true; Modified: trunk/launchd/src/liblaunch_public.h =================================================================== --- trunk/launchd/src/liblaunch_public.h 2007-02-07 21:07:49 UTC (rev 23039) +++ trunk/launchd/src/liblaunch_public.h 2007-02-07 23:39:58 UTC (rev 23040) @@ -58,6 +58,7 @@ #define LAUNCH_JOBKEY_USERNAME "UserName" #define LAUNCH_JOBKEY_GROUPNAME "GroupName" #define LAUNCH_JOBKEY_TIMEOUT "TimeOut" +#define LAUNCH_JOBKEY_EXITTIMEOUT "ExitTimeOut" #define LAUNCH_JOBKEY_INITGROUPS "InitGroups" #define LAUNCH_JOBKEY_SOCKETS "Sockets" #define LAUNCH_JOBKEY_MACHSERVICES "MachServices"

1 0

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

07 Feb '07

Revision: 23039 http://trac.macosforge.org/projects/launchd/changeset/23039 Author: zarzycki(a)apple.com Date: 2007-02-07 13:07:49 -0800 (Wed, 07 Feb 2007) Log Message: ----------- Clean up. Now if we can properly make our reflector threads go away, we should be able to go to single user mode again. :-) Modified Paths: -------------- trunk/launchd/src/launchd.c Modified: trunk/launchd/src/launchd.c =================================================================== --- trunk/launchd/src/launchd.c 2007-02-07 20:19:36 UTC (rev 23038) +++ trunk/launchd/src/launchd.c 2007-02-07 21:07:49 UTC (rev 23039) @@ -300,11 +300,11 @@ * to skip it. */ if (!h && stat(ldconf, &sb) == 0) { - job_dispatch(rlcj, true); + rlcj = job_dispatch(rlcj, true); } if (fbj) { - job_dispatch(fbj, true); + fbj = job_dispatch(fbj, true); } char *doom_why = "at instruction"; @@ -474,24 +474,15 @@ void launchd_single_user(void) { - int tries; + syslog(LOG_NOTICE, "Going to single-user mode"); + re_exec_in_single_user_mode = true; + launchd_shutdown(); - kill(-1, SIGTERM); + sleep(3); - for (tries = 0; tries < 10; tries++) { - sleep(1); - if (kill(-1, 0) == -1 && errno == ESRCH) { - goto out; - } - } - - syslog(LOG_WARNING, "Gave up waiting for processes to exit while going to single user mode, sending SIGKILL"); kill(-1, SIGKILL); - -out: - re_exec_in_single_user_mode = true; } static void signal_callback(void *obj __attribute__((unused)), struct kevent *kev) @@ -501,7 +492,7 @@ switch (kev->ident) { case SIGHUP: if (rlcj) { - job_dispatch(rlcj, true); + rlcj = job_dispatch(rlcj, true); } break; case SIGTERM: @@ -691,6 +682,7 @@ exit(EXIT_SUCCESS); } else if (re_exec_in_single_user_mode) { re_exec_in_single_user_mode = false; + kill(-1, SIGKILL); /* One last time, just to clear the room */ launchd_assumes(execl("/sbin/launchd", "/sbin/launchd", "-s", NULL) != -1); } }

1 0