[launchd-changes] [23198] trunk/launchd/src

[source_changes at macosforge.org]

Revision: 23198
          http://trac.macosforge.org/projects/launchd/changeset/23198
Author:   zarzycki at apple.com
Date:     2007-04-02 13:43:42 -0700 (Mon, 02 Apr 2007)

Log Message:
-----------
We always want EV_CLEAR behavior.

Modified Paths:
--------------
    trunk/launchd/src/launchd_core_logic.c
    trunk/launchd/src/launchd_runtime.c

Modified: trunk/launchd/src/launchd_core_logic.c
===================================================================
--- trunk/launchd/src/launchd_core_logic.c	2007-04-02 20:29:26 UTC (rev 23197)
+++ trunk/launchd/src/launchd_core_logic.c	2007-04-02 20:43:42 UTC (rev 23198)
@@ -2723,7 +2723,7 @@
 	}
 
 	job_log(j, LOG_DEBUG, "Watching Vnode: %d", si->fd);
-	job_assumes(j, kevent_mod(si->fd, EVFILT_VNODE, EV_ADD|EV_CLEAR, fflags, 0, j) != -1);
+	job_assumes(j, kevent_mod(si->fd, EVFILT_VNODE, EV_ADD, fflags, 0, j) != -1);
 }
 
 void
@@ -3627,7 +3627,7 @@
 
 	if (!jm) {
 		jobmgr_assumes(jmr, kevent_mod(SIGTERM, EVFILT_SIGNAL, EV_ADD, 0, 0, jmr) != -1);
-		jobmgr_assumes(jmr, kevent_mod(0, EVFILT_FS, EV_ADD|EV_CLEAR, VQ_MOUNT|VQ_UNMOUNT|VQ_UPDATE, 0, jmr) != -1);
+		jobmgr_assumes(jmr, kevent_mod(0, EVFILT_FS, EV_ADD, VQ_MOUNT|VQ_UNMOUNT|VQ_UPDATE, 0, jmr) != -1);
 	}
 
 	if (name) {

Modified: trunk/launchd/src/launchd_runtime.c
===================================================================
--- trunk/launchd/src/launchd_runtime.c	2007-04-02 20:29:26 UTC (rev 23197)
+++ trunk/launchd/src/launchd_runtime.c	2007-04-02 20:43:42 UTC (rev 23198)
@@ -264,9 +264,9 @@
 		else FLAGIF(EV_DELETE)
 		else FLAGIF(EV_ENABLE)
 		else FLAGIF(EV_DISABLE)
-		else FLAGIF(EV_ONESHOT)
 		else FLAGIF(EV_CLEAR)
 		else FLAGIF(EV_EOF)
+		else FLAGIF(EV_ONESHOT)
 		else FLAGIF(EV_ERROR)
 		else {
 			flags_off += sprintf(flags_off, "0x%x", flags);
@@ -678,6 +678,8 @@
 	struct kevent kev;
 	int q = mainkq;
 
+	flags |= EV_CLEAR;
+
 	if (EVFILT_TIMER == filter || EVFILT_VNODE == filter) {
 		q = asynckq;
 	}

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/launchd-changes/attachments/20070402/4aef7ec0/attachment.html