Merge branch 'master' into timeheap

[ashd.git] / lib / mtio-epoll.c

diff --git a/lib/mtio-epoll.c b/lib/mtio-epoll.c
index 2a25992..3082eaf 100644 (file)
--- a/lib/mtio-epoll.c
+++ b/lib/mtio-epoll.c
@@ -37,7 +37,7 @@ static struct blocker *blockers;
 struct blocker {
     struct blocker *n, *p, *n2, *p2;
     int fd, reg;
-    int ev;
+    int ev, rev, id;
     int thpos;
     time_t to;
     struct muth *th;
@@ -195,36 +195,76 @@ static void deltimeout(struct blocker *bl)
        thlower(ent, n);
 }
 
-int block(int fd, int ev, time_t to)
+static int addblock(struct blocker *bl)
 {
-    struct blocker *bl;
-    int rv;
-    
-    omalloc(bl);
-    bl->fd = fd;
-    bl->ev = ev;
-    bl->th = current;
-    if((epfd >= 0) && regfd(bl)) {
-       free(bl);
+    if((epfd >= 0) && regfd(bl))
        return(-1);
-    }
     bl->n = blockers;
     if(blockers)
        blockers->p = bl;
     blockers = bl;
-    if(to > 0)
-       addtimeout(bl, bl->to = (time(NULL) + to));
-    rv = yield();
+    if(bl->to > 0)
+       addtimeout(bl, bl->to);
+    return(0);
+}
+
+static void remblock(struct blocker *bl)
+{
     if(bl->to > 0)
        deltimeout(bl);
     if(bl->n)
        bl->n->p = bl->p;
     if(bl->p)
        bl->p->n = bl->n;
-    if(bl == blockers)
+    if(blockers == bl)
        blockers = bl->n;
     remfd(bl);
-    free(bl);
+}
+
+struct selected mblock(time_t to, int n, struct selected *spec)
+{
+    int i, id;
+    struct blocker bls[n];
+    
+    to = (to > 0)?(time(NULL) + to):0;
+    for(i = 0; i < n; i++) {
+       bls[i] = (struct blocker) {
+           .fd = spec[i].fd,
+           .ev = spec[i].ev,
+           .id = i,
+           .to = to,
+           .th = current,
+       };
+       if(addblock(&bls[i])) {
+           for(i--; i >= 0; i--)
+               remblock(&bls[i]);
+           return((struct selected){.fd = -1, .ev = -1});
+       }
+    }
+    id = yield();
+    for(i = 0; i < n; i++)
+       remblock(&bls[i]);
+    if(id < 0)
+       return((struct selected){.fd = -1, .ev = -1});
+    return((struct selected){.fd = bls[id].fd, .ev = bls[id].rev});
+}
+
+int block(int fd, int ev, time_t to)
+{
+    struct blocker bl;
+    int rv;
+    
+    bl = (struct blocker) {
+       .fd = fd,
+       .ev = ev,
+       .id = -1,
+       .to = (to > 0)?(time(NULL) + to):0,
+       .th = current,
+    };
+    if(addblock(&bl))
+       return(-1);
+    rv = yield();
+    remblock(&bl);
     return(rv);
 }
 
@@ -275,13 +315,25 @@ int ioloop(void)
                ev = -1;
            for(bl = fdlist[fd]; bl; bl = nbl) {
                nbl = bl->n2;
-               if((ev < 0) || (ev & bl->ev))
-                   resume(bl->th, ev);
+               if((ev < 0) || (ev & bl->ev)) {
+                   if(bl->id < 0) {
+                       resume(bl->th, ev);
+                   } else {
+                       bl->rev = ev;
+                       resume(bl->th, bl->id);
+                   }
+               }
            }
        }
        now = time(NULL);
-       while((timeheap.d > 0) && (timeheap.b[0].to <= now))
-           resume(timeheap.b[0].bl->th, 0);
+       while((timeheap.d > 0) && (timeheap.b[0].to <= now)) {
+           if(bl->id < 0) {
+               resume(timeheap.b[0].bl->th, 0);
+           } else {
+               bl->rev = 0;
+               resume(bl->th, bl->id);
+           }
+       }
     }
     for(bl = blockers; bl; bl = bl->n)
        remfd(bl);