Revision: 23301 http://trac.macosforge.org/projects/launchd/changeset/23301 Author: zarzycki@apple.com Date: 2007-07-10 14:41:36 -0700 (Tue, 10 Jul 2007) Log Message: ----------- Disable NOTE_REAP while we investigate 5289559. 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-07-10 20:31:35 UTC (rev 23300) +++ trunk/launchd/src/launchd_core_logic.c 2007-07-10 21:41:36 UTC (rev 23301) @@ -995,7 +995,7 @@ } if (jobmgr_assumes(jm, (jr = job_new(jm, AUTO_PICK_LEGACY_LABEL, zombie ? zombie : kp.kp_proc.p_comm, NULL)) != NULL)) { - u_int proc_fflags = NOTE_EXEC|NOTE_EXIT|NOTE_REAP; + u_int proc_fflags = NOTE_EXEC|NOTE_EXIT /* |NOTE_REAP */; total_children++; jr->anonymous = true; @@ -2096,12 +2096,15 @@ } } + /* NOTE_REAP sanity checking is disabled for now while we try and diagnose 5289559 */ +#if 0 if (j && (fflags & NOTE_REAP)) { job_assumes(j, flags & EV_ONESHOT); job_assumes(j, flags & EV_EOF); job_assumes(j, j->p == 0); } +#endif } void @@ -2234,7 +2237,7 @@ pid_t c; bool sipc = false; time_t td; - u_int proc_fflags = /* NOTE_EXEC|NOTE_FORK| */ NOTE_EXIT|NOTE_REAP; + u_int proc_fflags = /* NOTE_EXEC|NOTE_FORK| */ NOTE_EXIT /* |NOTE_REAP */; if (!job_assumes(j, j->mgr != NULL)) { return;