Changeset 23250

Timestamp:

05/10/07 14:23:35 (19 months ago)

Author:

zarzycki@…

Message:

Let's start using the EV_RECEIPT feature I added to the kernel kqueue logic.

Location:

trunk/launchd/src

Files:

• launchd_core_logic.c (modified) (2 diffs)
• launchd_runtime.c (modified) (1 diff)
• launchd_runtime.h (modified) (1 diff)

trunk/launchd/src/launchd_core_logic.c

@@ -3069 +3069 @@
 socketgroup_watch(job_t j, struct socketgroup *sg)
 {
+        struct kevent kev[sg->fd_cnt];
         char buf[10000];
         unsigned int i, buf_off = 0;
@@ -3082 +3083 @@
 
         for (i = 0; i < sg->fd_cnt; i++) {
-                job_assumes(j, kevent_mod(sg->fds[i], EVFILT_READ, EV_ADD, 0, 0, j) != -1);
+                EV_SET(&kev[i], sg->fds[i], EVFILT_READ, EV_ADD, 0, 0, j);
+        }
+
+        job_assumes(j, kevent_bulk_mod(kev, sg->fd_cnt) != -1);
+
+        for (i = 0; i < sg->fd_cnt; i++) {
+                job_assumes(j, kev[i].flags & EV_ERROR);
+                errno = kev[i].data;
+                job_assumes(j, kev[i].data == 0);
         }
 }

trunk/launchd/src/launchd_runtime.c

@@ -677 +677 @@
 
 int
+kevent_bulk_mod(struct kevent *kev, size_t kev_cnt)
+{
+        size_t i;
+
+        for (i = 0; i < kev_cnt; i++) {
+                kev[i].flags |= EV_CLEAR|EV_RECEIPT;
+        }
+
+        return kevent(mainkq, kev, kev_cnt, kev, kev_cnt, NULL);
+}
+
+int
 kevent_mod(uintptr_t ident, short filter, u_short flags, u_int fflags, intptr_t data, void *udata)
 {

trunk/launchd/src/launchd_runtime.h

@@ -72 +72 @@
 
 
+int kevent_bulk_mod(struct kevent *kev, size_t kev_cnt);
 int kevent_mod(uintptr_t ident, short filter, u_short flags, u_int fflags, intptr_t data, void *udata);