Changeset 23042

Timestamp:

02/08/07 07:21:26 (22 months ago)

Author:

zarzycki@…

Message:

<rdar://problem/4943031> Add plist option to mimic the kernel's KERN_PROCDELAYTERM

Location:

trunk/launchd/src

Files:

• launchd.c (modified) (3 diffs)
• launchd.h (modified) (1 diff)
• launchd.plist.5 (modified) (1 diff)
• launchd_core_logic.c (modified) (12 diffs)
• launchd_core_logic.h (modified) (1 diff)
• liblaunch_public.h (modified) (1 diff)

trunk/launchd/src/launchd.c

@@ -111 +111 @@
 
 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;
@@ -470 +470 @@
         rlcj = NULL;
 
-        jobmgr_remove_all_inactive(root_jobmgr);
+        root_jobmgr = jobmgr_shutdown(root_jobmgr);
 }
 
@@ -677 +677 @@
 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;
 

trunk/launchd/src/launchd.h

@@ -35 +35 @@
 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;

trunk/launchd/src/launchd.plist.5

@@ -272 +272 @@
 .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.

trunk/launchd/src/launchd_core_logic.c

@@ -200 +200 @@
         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];
 };
@@ -209 +209 @@
 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);
@@ -269 +270 @@
         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];
 };
@@ -511 +512 @@
 }
 
-void
-jobmgr_remove_all_inactive(jobmgr_t jm)
+jobmgr_t
+jobmgr_shutdown(jobmgr_t jm)
 {
         jobmgr_t jmi, jmn;
@@ -518 +519 @@
 
         SLIST_FOREACH_SAFE(jmi, &jm->submgrs, sle, jmn) {
-                jobmgr_remove_all_inactive(jmi);
+                jobmgr_shutdown(jmi);
         }
 
@@ -524 +525 @@
                 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);
 }
 
@@ -596 +601 @@
         }
 
+        if (j->forkfd) {
+                job_assumes(j, close(j->forkfd) != -1);
+        }
+
+        if (j->log_redirect_fd) {
+                job_assumes(j, close(j->log_redirect_fd) != -1);
+        }
+
+        if (j->j_port) {
+                job_assumes(j, launchd_mport_close_recv(j->j_port) == KERN_SUCCESS);
+        }
+
+        if (!job_assumes(j, j->wait_reply_port == MACH_PORT_NULL)) {
+                job_assumes(j, launchd_mport_deallocate(j->wait_reply_port) == KERN_SUCCESS);
+        }
+
+        while ((sg = SLIST_FIRST(&j->sockets))) {
+                socketgroup_delete(j, sg);
+        }
+        while ((ci = SLIST_FIRST(&j->cal_intervals))) {
+                calendarinterval_delete(j, ci);
+        }
+        while ((ei = SLIST_FIRST(&j->env))) {
+                envitem_delete(j, ei, false);
+        }
+        while ((ei = SLIST_FIRST(&j->global_env))) {
+                envitem_delete(j, ei, true);
+        }
+        while ((li = SLIST_FIRST(&j->limits))) {
+                limititem_delete(j, li);
+        }
+        while ((ms = SLIST_FIRST(&j->machservices))) {
+                machservice_delete(ms);
+        }
+        while ((si = SLIST_FIRST(&j->semaphores))) {
+                semaphoreitem_delete(j, si);
+        }
+
+        if (j->prog) {
+                free(j->prog);
+        }
+        if (j->argv) {
+                free(j->argv);
+        }
+        if (j->rootdir) {
+                free(j->rootdir);
+        }
+        if (j->workingdir) {
+                free(j->workingdir);
+        }
+        if (j->username) {
+                free(j->username);
+        }
+        if (j->groupname) {
+                free(j->groupname);
+        }
+        if (j->stdinpath) {
+                free(j->stdinpath);
+        }
+        if (j->stdoutpath) {
+                free(j->stdoutpath);
+        }
+        if (j->stderrpath) {
+                free(j->stderrpath);
+        }
+        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);
+
         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);
-        }
-
-        if (j->log_redirect_fd) {
-                job_assumes(j, close(j->log_redirect_fd) != -1);
-        }
-
-        if (j->j_port) {
-                job_assumes(j, launchd_mport_close_recv(j->j_port) == KERN_SUCCESS);
-        }
-
-        if (!job_assumes(j, j->wait_reply_port == MACH_PORT_NULL)) {
-                job_assumes(j, launchd_mport_deallocate(j->wait_reply_port) == KERN_SUCCESS);
-        }
-
-        while ((sg = SLIST_FIRST(&j->sockets))) {
-                socketgroup_delete(j, sg);
-        }
-        while ((ci = SLIST_FIRST(&j->cal_intervals))) {
-                calendarinterval_delete(j, ci);
-        }
-        while ((ei = SLIST_FIRST(&j->env))) {
-                envitem_delete(j, ei, false);
-        }
-        while ((ei = SLIST_FIRST(&j->global_env))) {
-                envitem_delete(j, ei, true);
-        }
-        while ((li = SLIST_FIRST(&j->limits))) {
-                limititem_delete(j, li);
-        }
-        while ((ms = SLIST_FIRST(&j->machservices))) {
-                machservice_delete(ms);
-        }
-        while ((si = SLIST_FIRST(&j->semaphores))) {
-                semaphoreitem_delete(j, si);
-        }
-
-        if (j->prog) {
-                free(j->prog);
-        }
-        if (j->argv) {
-                free(j->argv);
-        }
-        if (j->rootdir) {
-                free(j->rootdir);
-        }
-        if (j->workingdir) {
-                free(j->workingdir);
-        }
-        if (j->username) {
-                free(j->username);
-        }
-        if (j->groupname) {
-                free(j->groupname);
-        }
-        if (j->stdinpath) {
-                free(j->stdinpath);
-        }
-        if (j->stdoutpath) {
-                free(j->stdoutpath);
-        }
-        if (j->stderrpath) {
-                free(j->stderrpath);
-        }
-        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);
+                jobmgr_tickle(j->mgr);
+        }
+
         free(j);
 }
@@ -895 +902 @@
         job_t j;
 
-        if (shutdown_in_progress) {
+        if (jm->shutting_down) {
                 errno = EINVAL;
                 return NULL;
@@ -1035 +1042 @@
                 if (strcasecmp(key, LAUNCH_JOBKEY_DEBUG) == 0) {
                         j->debug = value;
+                }
+                break;
+        case 'h':
+        case 'H':
+                if (strcasecmp(key, LAUNCH_JOBKEY_HOPEFULLYEXITSLAST) == 0) {
+                        j->hopefully_exits_last = value;
                 }
                 break;
@@ -2806 +2819 @@
                 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;
@@ -3163 +3176 @@
 }
 
+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)
@@ -3322 +3364 @@
 
         if (jm->req_port == port) {
-                if (jm == root_jobmgr) {
-                        launchd_shutdown();
-                } else {
-                        return jobmgr_remove(jm);
-                }
+                jobmgr_shutdown(jm);
         }
 

trunk/launchd/src/launchd_core_logic.h

@@ -33 +33 @@
 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);

trunk/launchd/src/liblaunch_public.h

@@ -79 +79 @@
 #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"