Changeset 35030

Timestamp:

08/24/09 21:46:13 (4 years ago)

Author:

kazuho

Message:

now uses same strategy for epoll as libev does

Files:

• lang/c/picoev/trunk/picoev_epoll.c (modified) (3 diffs)

lang/c/picoev/trunk/picoev_epoll.c

@@ -28 +28 @@
  */
 
+#include <errno.h>
 #include <sys/epoll.h>
 #include <unistd.h>
@@ -55 +56 @@
        socket was reopened, it might require re-assigning */
     int old_events = BACKEND_GET_OLD_EVENTS(target->_backend);
-    if (target->events == 0) {
+    if (old_events != 0 && target->events == 0) {
       epoll_ctl(loop->epfd, EPOLL_CTL_DEL, fd, 0);
     } else {
       struct epoll_event ev;
+      int r;
       ev.events = ((target->events & PICOEV_READ) != 0 ? EPOLLIN : 0)
         | ((target->events & PICOEV_WRITE) != 0 ? EPOLLOUT : 0);
       ev.data.fd = fd;
-      if (old_events == 0
-          || epoll_ctl(loop->epfd, EPOLL_CTL_MOD, fd, &ev) != 0) {
-        int r = epoll_ctl(loop->epfd, EPOLL_CTL_ADD, fd, &ev);
-        assert(r == 0);
+      if (old_events != 0) {
+        if (epoll_ctl(loop->epfd, EPOLL_CTL_MOD, fd, &ev) != 0) {
+          assert(errno == ENOENT);
+          r = epoll_ctl(loop->epfd, EPOLL_CTL_ADD, fd, &ev);
+          assert(r == 0);
+        }
+      } else {
+        if (epoll_ctl(loop->epfd, EPOLL_CTL_ADD, fd, &ev) != 0) {
+          assert(errno == EEXIST);
+          r = epoll_ctl(loop->epfd, EPOLL_CTL_MOD, fd, &ev);
+          assert(r == 0);
+        }
       }
     }
@@ -177 +187 @@
                           target->cb_arg);
     } else {
-      CALL_EPOLL(loop->epfd, EPOLL_CTL_DEL, event->data.fd, 0);
+      epoll_ctl(loop->epfd, EPOLL_CTL_DEL, event->data.fd, 0);
     }
   }