Changeset 23046

Timestamp:

02/08/07 14:39:50 (22 months ago)

Author:

zarzycki@…

Message:

More shutdown logic clean up and sanity checking.

Location:

trunk/launchd/src

Files:

• launchd_core_logic.c (modified) (7 diffs)
• launchd_runtime.c (modified) (3 diffs)

trunk/launchd/src/launchd_core_logic.c

@@ -517 +517 @@
         job_t ji, jn;
 
+        jobmgr_log(jm, LOG_DEBUG, "Beginning job manager shutdown");
+
         SLIST_FOREACH_SAFE(jmi, &jm->submgrs, sle, jmn) {
                 jobmgr_shutdown(jmi);
@@ -540 +542 @@
         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);
         }
 
@@ -570 +576 @@
         if (jm->jm_stderr) {
                 free(jm->jm_stderr);
+        }
+
+        if (jm->parentmgr) {
+                SLIST_REMOVE(&jm->parentmgr->submgrs, jm, jobmgr_s, sle);
+                jobmgr_tickle(jm->parentmgr);
         }
         
@@ -591 +602 @@
         }
 
-        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 (j->forkfd) {
+        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);
         }
 
-        if (j->log_redirect_fd) {
+        if (!job_assumes(j, j->log_redirect_fd == 0)) {
                 job_assumes(j, close(j->log_redirect_fd) != -1);
         }
@@ -2804 +2811 @@
                 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))) {
@@ -3194 +3210 @@
         job_t ji;
 
+        if (!SLIST_EMPTY(&jm->submgrs)) {
+                return false;
+        }
+
         SLIST_FOREACH(ji, &jm->jobs, sle) {
                 if (ji->p) {
@@ -3320 +3340 @@
 
         jobmgr_assumes(jmr, jmr->anonj != NULL);
+
+        jobmgr_log(jmr, LOG_DEBUG, "Created job manager");
 
         return jmr;

trunk/launchd/src/launchd_runtime.c

@@ -36 +36 @@
 #include <mach/exception.h>
 #include <sys/types.h>
+#include <sys/stat.h>
 #include <sys/time.h>
 #include <sys/event.h>
@@ -579 +580 @@
                 /* XXX - So very gross */
                 if (gc_this_jobmgr) {
-                        jobmgr_remove(gc_this_jobmgr);
+                        jobmgr_shutdown(gc_this_jobmgr);
                         gc_this_jobmgr = NULL;
                 }
@@ -675 +676 @@
 
         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);
         }