Changeset 34990

Timestamp:

08/23/09 22:21:31 (4 years ago)

Author:

kazuho

Message:

add kqueue support

Location:

lang/c/picoev/trunk

Files:

• picoev.h (modified) (3 diffs)
• picoev_epoll.c (modified) (3 diffs)
• picoev_kqueue.c (added)

lang/c/picoev/trunk/picoev.h

@@ -165 +165 @@
     target->events = 0;
     target->timeout_idx = -1;
-    if (picoev_update_events_internal(loop, fd, events) != 0) {
+    if (events != 0 && picoev_update_events_internal(loop, fd, events) != 0) {
       target->loop_id = 0;
       return -1;
@@ -179 +179 @@
     assert(PICOEV_IS_INITED_AND_FD_IN_RANGE(fd));
     target = picoev.fds + fd;
-    if (target->events != 0) {
-      if (picoev_update_events_internal(loop, fd, 0) != 0) {
-        return -1;
-      }
+    if (target->events != 0
+        && picoev_update_events_internal(loop, fd, 0) != 0) {
+      return -1;
     }
     picoev_set_timeout(loop, fd, 0);
@@ -200 +199 @@
   int picoev_set_events(picoev_loop* loop, int fd, int events) {
     assert(PICOEV_IS_INITED_AND_FD_IN_RANGE(fd));
-    if (picoev.fds[fd].events != events) {
-      if (picoev_update_events_internal(loop, fd, events) != 0) {
-        return -1;
-      }
+    if (picoev.fds[fd].events != events
+        && picoev_update_events_internal(loop, fd, events) != 0) {
+      return -1;
     }
     return 0;

lang/c/picoev/trunk/picoev_epoll.c

@@ -16 +16 @@
   int old_events = picoev.fds[fd].events;
   
+  assert(PICOEV_FD_BELONGS_TO_LOOP(&loop->loop, fd));
+  
 #define CTL(m, e)                             \
   if (epoll_ctl(loop->epfd, m, fd, e) != 0) { \
@@ -21 +23 @@
   }
   
-  if (old_events == events) {
-    return 0;
-  }
-  if (events != 0) {
+  if (events == 0) {
+    CTL(EPOLL_CTL_DEL, 0);
+  } else {
     struct epoll_event ev;
     ev.events = ((events & PICOEV_READ) != 0 ? EPOLLIN : 0)
@@ -34 +35 @@
       CTL(EPOLL_CTL_ADD, &ev);
     }
-  } else {
-    CTL(EPOLL_CTL_DEL, 0);
   }