Changeset 33b7efe6ca32e4a2a683db89cf86828a9b1ab096

Timestamp:

11/09/11 00:12:54 (2 years ago)

Author:

Dan Di Spaltro <dan@cloudkick.com>

git-committer:

Dan Di Spaltro <dan@cloudkick.com> 1320797574 -0800

git-parent:

[fbf2b3181e1cc48410fe39bb0f0c291d73095a8f]

git-author:

Dan Di Spaltro <dan@cloudkick.com> 1320727127 -0800

Message:

Assert when result is not 0
Fix usage where we re-add an already added event.
Fix usage where we remove after closing, change the order in that case

Files:

• src/eventer/eventer_epoll_impl.c (modified) (5 diffs)
• src/modules/check_test.c (modified) (1 diff)
• src/modules/lua.c (modified) (1 diff)

src/eventer/eventer_epoll_impl.c

@@ -114 +114 @@
-  master_fds[e->fd].e = e;
-
-epoll_ctl(epoll_fd, EPOLL_CTL_ADD, e->fd, &_ev
+assert(epoll_ctl(epoll_fd, EPOLL_CTL_ADD, e->fd, &_ev) == 0
-
-  release_master_fd(e->fd, lockstate);
@@ -132 +132 @@
-      removed = e;
-      master_fds[e->fd].e = NULL;
-epoll_ctl(epoll_fd, EPOLL_CTL_DEL, e->fd, &_ev
+assert(epoll_ctl(epoll_fd, EPOLL_CTL_DEL, e->fd, &_ev) == 0
-    }
-    release_master_fd(e->fd, lockstate);
@@ -160 +160 @@
-    if(e->mask & EVENTER_WRITE) _ev.events |= (EPOLLOUT);
-    if(e->mask & EVENTER_EXCEPTION) _ev.events |= (EPOLLERR|EPOLLHUP);
-epoll_ctl(epoll_fd, EPOLL_CTL_MOD, e->fd, &_ev
+assert(epoll_ctl(epoll_fd, EPOLL_CTL_MOD, e->fd, &_ev) == 0
-  }
-}
@@ -173 +173 @@
-    eiq = master_fds[fd].e;
-    master_fds[fd].e = NULL;
-epoll_ctl(epoll_fd, EPOLL_CTL_DEL, fd, &_ev
+assert(epoll_ctl(epoll_fd, EPOLL_CTL_DEL, fd, &_ev) == 0
-    release_master_fd(fd, lockstate);
-  }
@@ -208 +208 @@
-    if(newmask & EVENTER_WRITE) _ev.events |= (EPOLLOUT);
-    if(newmask & EVENTER_EXCEPTION) _ev.events |= (EPOLLERR|EPOLLHUP);
-epoll_ctl(epoll_fd, EPOLL_CTL_MOD, fd, &_ev
+assert(epoll_ctl(epoll_fd, EPOLL_CTL_MOD, fd, &_ev) == 0
-    /* Set our mask */
-    e->mask = newmask;

src/modules/check_test.c

@@ -191 +191 @@
-  
-    if(conne) {
-
+
+
-      eventer_trigger(conne, EVENTER_READ | EVENTER_WRITE);
-    }

src/modules/lua.c

@@ -102 +102 @@
-  eventer_t removed, e = *value;
-  noitL(nldeb, "lua check cleanup: dropping (%p)->fd (%d)\n", e, e->fd);
+  removed = eventer_remove(e);
+  noitL(nldeb, "    remove from eventer system %s\n",
+        removed ? "succeeded" : "failed");
-  if(e->mask & (EVENTER_READ|EVENTER_WRITE|EVENTER_EXCEPTION)) {
-    noitL(nldeb, "    closing down fd %d\n", e->fd);
-    e->opset->close(e->fd, &mask, e);
-  }
-  removed = eventer_remove(e);
-  noitL(nldeb, "    remove from eventer system %s\n",
-        removed ? "succeeded" : "failed");
-  if(e->closure) {
-    struct nl_generic_cl *cl;