Changeset 23242

Timestamp:

05/07/07 14:15:05 (19 months ago)

Author:

zarzycki@…

Message:

<rdar://problem/5179313> Log: launchd_core_logic.c:1986 (23240):2: (flags & EV_ONESHOT)

Files:

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

trunk/launchd/src/launchd_core_logic.c

@@ -998 +998 @@
 
         if (jobmgr_assumes(jm, (jr = job_new(jm, AUTO_PICK_LEGACY_LABEL, kp.kp_proc.p_comm, NULL)) != NULL)) {
-                u_int proc_fflags = NOTE_EXEC|NOTE_EXIT;
-
-#ifdef NOTE_REAP
-                proc_fflags |= NOTE_REAP;
-#endif
+                u_int proc_fflags = NOTE_EXEC|NOTE_EXIT|NOTE_REAP;
 
                 total_children++;
@@ -1984 +1980 @@
 
         if (fflags & NOTE_EXIT) {
-                job_assumes(j, (flags & EV_ONESHOT));
-                job_assumes(j, (flags & EV_EOF));
                 job_reap(j);
 
                 if (j->anonymous) {
                         job_remove(j);
+                        j = NULL;
                 } else {
                         j = job_dispatch(j, false);
@@ -1995 +1990 @@
         }
 
-#ifdef NOTE_REAP
         if (j && (fflags & NOTE_REAP)) {
+                job_assumes(j, flags & EV_ONESHOT);
+                job_assumes(j, flags & EV_EOF);
+
                 job_assumes(j, j->p == 0);
         }
-#endif
 }
 
@@ -2122 +2118 @@
         bool sipc = false;
         time_t td;
-        u_int proc_fflags = /* NOTE_EXEC|NOTE_FORK| */ NOTE_EXIT;
-
-#ifdef NOTE_REAP
-        proc_fflags |= NOTE_REAP;
-#endif
+        u_int proc_fflags = /* NOTE_EXEC|NOTE_FORK| */ NOTE_EXIT|NOTE_REAP;
 
         if (!job_assumes(j, j->mgr != NULL)) {