Merge branch 'timeheap'

This should fix the mblock-related iteration bug in mtio-epoll.

diff --git a/lib/mtio-kqueue.c b/lib/mtio-kqueue.c
index e317153..0ae9ccf 100644 (file)
--- a/lib/mtio-kqueue.c
+++ b/lib/mtio-kqueue.c
@@ -262,6 +262,8 @@ int ioloop(void)
            }
        }
        now = time(NULL);
+       /* XXX: This is inefficient and buggy, and should have the
+        * heap structure from mtio-epoll ported. */
        for(bl = blockers; bl; bl = nbl) {
            nbl = bl->n;
            if((bl->to != 0) && (bl->to <= now)) {