From: Fredrik Tolf <fredrik@dolda2000.com>
Date: Sat, 31 Dec 2016 19:26:22 +0000 (+0100)
Subject: Merge branch 'timeheap'
X-Git-Url: http://www.dolda2000.com/gitweb/?p=ashd.git;a=commitdiff_plain;h=37c1ac8da3808b3a806c4201791bb7c7f8349d15

Merge branch 'timeheap'

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

37c1ac8da3808b3a806c4201791bb7c7f8349d15
diff --cc lib/mtio-kqueue.c
index e317153,e317153..0ae9ccf
--- a/lib/mtio-kqueue.c
+++ b/lib/mtio-kqueue.c
@@@ -262,6 -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)) {