Changeset 23054

Timestamp:

02/09/07 19:25:34 (22 months ago)

Author:

zarzycki@…

Message:

Misc

Files:

• trunk/launchd/src/launchd_core_logic.c (modified) (5 diffs)

trunk/launchd/src/launchd_core_logic.c

@@ -202 +202 @@
         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];
@@ -1772 +1771 @@
 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);
 }
 
@@ -1789 +1781 @@
         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:
@@ -1926 +1923 @@
                         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);
@@ -3502 +3499 @@
 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);
         }