Changeset e435c5bf61eb1f943d440e635521d9ce21e78a2d

Timestamp:

05/13/08 18:14:46 (5 years ago)

Author:

Theo Schlossnagle <jesus@omniti.com>

git-committer:

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

git-parent:

[c1fcb76822fc1aa6b47a9999834cab6c2abeba47]

git-author:

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

Message:

closes #14

Files:

• src/eventer/eventer_epoll_impl.c (modified) (1 diff)
• src/eventer/eventer_kqueue_impl.c (modified) (8 diffs)

src/eventer/eventer_epoll_impl.c

@@ -303 +303 @@
-        }
-        else {
+          /* see kqueue implementation for details on the next line */
+          if(master_fds[fd].e == e) master_fds[fd].e = NULL;
-          eventer_free(e);
-        }

src/eventer/eventer_kqueue_impl.c

@@ -138 +138 @@
-  assert(e->mask);
-  ev_lock_state_t lockstate;
+  const char *cbname;
+  cbname = eventer_name_for_callback(e->callback);
-
-  if(e->mask & EVENTER_ASYNCH) {
+    noitL(eventer_deb, "debug: eventer_add asynch (%s)\n", cbname ? cbname : "???");
-    eventer_add_asynch(NULL, e);
-    return;
@@ -146 +149 @@
-  /* Recurrent delegation */
-  if(e->mask & EVENTER_RECURRENT) {
+    noitL(eventer_deb, "debug: eventer_add recurrent (%s)\n", cbname ? cbname : "???");
-    eventer_add_recurrent(e);
-    return;
@@ -152 +156 @@
-  /* Timed events are simple */
-  if(e->mask & EVENTER_TIMER) {
+    noitL(eventer_deb, "debug: eventer_add timed (%s)\n", cbname ? cbname : "???");
-    pthread_mutex_lock(&te_lock);
-    noit_skiplist_insert(timed_events, e);
@@ -159 +164 @@
-
-  /* file descriptor event */
+  noitL(eventer_deb, "debug: eventer_add fd (%s,%d,0x%04x)\n", cbname ? cbname : "???", e->fd, e->mask);
-  lockstate = acquire_master_fd(e->fd);
-  master_fds[e->fd].e = e;
@@ -248 +254 @@
-  pthread_setspecific(kqueue_setup_key, kqs);
-  while(1) {
+    const char *cbname;
-    struct timeval __now, __sleeptime;
-    struct timespec __kqueue_sleeptime;
@@ -281 +288 @@
-      if(timed_event == NULL) break;
-
+      cbname = eventer_name_for_callback(timed_event->callback);
+      noitLT(eventer_deb, &__now, "debug: timed dispatch(%s)\n", cbname ? cbname : "???");
-      /* Make our call */
-      newmask = timed_event->callback(timed_event, EVENTER_TIMER,
@@ -344 +353 @@
-      /* Loop a last time to process */
-      for(idx = 0; idx < fd_cnt; idx++) {
-        const char *cbname;
-        ev_lock_state_t lockstate;
-        struct kevent *ke;
@@ -392 +400 @@
-        }
-        else {
+          /*
+           * Long story long:
+           *  When integrating with a few external event systems, we find
+           *  it difficult to make their use of remove+add as an update
+           *  as it can be recurrent in a single handler call and you cannot
+           *  remove completely from the event system if you are going to
+           *  just update (otherwise the eventer_t in your call stack could
+           *  be stale).  What we do is perform a superficial remove, marking
+           *  the mask as 0, but not eventer_remove_fd.  Then on an add, if
+           *  we already have an event, we just update the mask (as we
+           *  have not yet returned to the eventer's loop.
+           *  This leaves us in a tricky situation when a remove is called
+           *  and the add doesn't roll in, we return 0 (mask == 0) and hit
+           *  this spot.  We have intended to remove the event, but it still
+           *  resides at master_fds[fd].e -- even after we free it.
+           *  So, in the evnet that we return 0 and the event that
+           *  master_fds[fd].e == the event we're about to free... we NULL
+           *  it out.
+           */
+          if(master_fds[fd].e == e) master_fds[fd].e = NULL;
-          eventer_free(e);
-        }