Changeset df2e1eb8a0d6b779a1327d8df4d867b961ce4b07

Timestamp:

12/04/08 16:35:03 (4 years ago)

Author:

Theo Schlossnagle <jesus@omniti.com>

git-committer:

Theo Schlossnagle <jesus@omniti.com> 1228408503 +0000

git-parent:

[9295ab0de02cda482cfd2a5762f8a76727b480d1]

git-author:

Theo Schlossnagle <jesus@omniti.com> 1228408503 +0000

Message:

fixed #66

Files:

• src/eventer/eventer.h (modified) (1 diff)
• src/eventer/eventer_epoll_impl.c (modified) (2 diffs)
• src/eventer/eventer_kqueue_impl.c (modified) (2 diffs)
• src/eventer/eventer_ports_impl.c (modified) (2 diffs)
• src/noit_console.c (modified) (1 diff)
• src/noit_http.c (modified) (1 diff)

src/eventer/eventer.h

@@ -75 +75 @@
-  void              (*add)(eventer_t e);
-  eventer_t         (*remove)(eventer_t e);
-
+, int newmask
-  eventer_t         (*remove_fd)(int fd);
-  eventer_t         (*find_fd)(int fd);

src/eventer/eventer_epoll_impl.c

@@ -159 +159 @@
-  return removed;
-}
-
+, int mask
-  struct epoll_event _ev;
-  if(e->mask & EVENTER_TIMER) {
+    assert(e->mask & EVENTER_TIMER);
-    pthread_mutex_lock(&te_lock);
-    noit_skiplist_remove_compare(timed_events, e, NULL, noit_compare_voidptr);
@@ -170 +171 @@
-  memset(&_ev, 0, sizeof(_ev));
-  _ev.data.fd = e->fd;
+  e->mask = mask;
-  if(e->mask & (EVENTER_READ | EVENTER_WRITE | EVENTER_EXCEPTION)) {
-    if(e->mask & EVENTER_READ) _ev.events |= (EPOLLIN|EPOLLPRI);

src/eventer/eventer_kqueue_impl.c

@@ -206 +206 @@
-  return removed;
-}
-
+, int mask
-  if(e->mask & EVENTER_TIMER) {
+    assert(mask & EVENTER_TIMER);
-    pthread_mutex_lock(&te_lock);
-    noit_skiplist_remove_compare(timed_events, e, NULL, noit_compare_voidptr);
@@ -214 +215 @@
-    return;
-  }
-ke_change(e->fd, EVFILT_READ, EV_DELETE | EV_DISABLE, e);
-ke_change(e->fd, EVFILT_WRITE, EV_DELETE | EV_DISABLE, e);
-if(e->mask & (EVENTER_READ | EVENTER_EXCEPTION
+/* Disable old, if they aren't active in the new */
+if((e->mask & (EVENTER_READ | EVENTER_EXCEPTION)) &&
+   !(mask & (EVENTER_READ | EVENTER_EXCEPTION)
-    ke_change(e->fd, EVFILT_READ, EV_DELETE | EV_DISABLE, e);
-
+
+
-    ke_change(e->fd, EVFILT_WRITE, EV_DELETE | EV_DISABLE, e);
+
+  /* Enable new, if the weren't in the old */
+  if((mask & (EVENTER_READ | EVENTER_EXCEPTION)) &&
+     !(e->mask & (EVENTER_READ | EVENTER_EXCEPTION)))
+    ke_change(e->fd, EVFILT_READ, EV_ADD | EV_ENABLE, e);
+  if((mask & (EVENTER_WRITE)) &&
+     !(e->mask & (EVENTER_WRITE)))
+    ke_change(e->fd, EVFILT_WRITE, EV_ADD | EV_ENABLE, e);
+
+  /* Switch */
+  e->mask = mask;
-}
-static eventer_t eventer_kqueue_impl_remove_fd(int fd) {

src/eventer/eventer_ports_impl.c

@@ -175 +175 @@
-  return removed;
-}
-
+, int mask
-  if(e->mask & EVENTER_TIMER) {
+    assert(mask & EVENTER_TIMER);
-    pthread_mutex_lock(&te_lock);
-    noit_skiplist_remove_compare(timed_events, e, NULL, noit_compare_voidptr);
@@ -183 +184 @@
-    return;
-  }
-
+
+
-}
-static eventer_t eventer_ports_impl_remove_fd(int fd) {

src/noit_console.c

@@ -437 +437 @@
-  while((rv = noit_console_continue_sending(ncct, &mask)) == -1 && errno == EINTR);
-  if(rv == -1 && errno == EAGAIN) {
-
-
+
-  }
-  return rlen;

src/noit_http.c

@@ -647 +647 @@
-  _http_perform_write(ctx, &mask);
-  if(ctx->conn.e) {
-
-
+
-  }
-  return noit_true;