lib: Split epoll and select loops into separate files.

[ashd.git] / lib / mtio.c

diff --git a/lib/mtio.c b/lib/mtio.c
index c861261..43cc1f7 100644 (file)
--- a/lib/mtio.c
+++ b/lib/mtio.c
@@ -19,11 +19,8 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <fcntl.h>
-#include <unistd.h>
 #include <string.h>
-#include <time.h>
 #include <errno.h>
-#include <sys/select.h>
 #include <sys/socket.h>
 
 #ifdef HAVE_CONFIG_H
@@ -34,98 +31,6 @@
 #include <mt.h>
 #include <mtio.h>
 
-struct blocker {
-    struct blocker *n, *p;
-    int fd;
-    int ev;
-    time_t to;
-    struct muth *th;
-};
-
-static struct blocker *blockers;
-
-int block(int fd, int ev, time_t to)
-{
-    struct blocker *bl;
-    int rv;
-    
-    omalloc(bl);
-    bl->fd = fd;
-    bl->ev = ev;
-    if(to > 0)
-       bl->to = time(NULL) + to;
-    bl->th = current;
-    bl->n = blockers;
-    if(blockers)
-       blockers->p = bl;
-    blockers = bl;
-    rv = yield();
-    if(bl->n)
-       bl->n->p = bl->p;
-    if(bl->p)
-       bl->p->n = bl->n;
-    if(bl == blockers)
-       blockers = bl->n;
-    return(rv);
-}
-
-void ioloop(void)
-{
-    int ret;
-    fd_set rfds, wfds, efds;
-    struct blocker *bl, *nbl;
-    struct timeval toval;
-    time_t now, timeout;
-    int maxfd;
-    int ev;
-    
-    while(blockers != NULL) {
-       FD_ZERO(&rfds);
-       FD_ZERO(&wfds);
-       FD_ZERO(&efds);
-       maxfd = 0;
-       now = time(NULL);
-       timeout = 0;
-       for(bl = blockers; bl; bl = bl->n) {
-           if(bl->ev & EV_READ)
-               FD_SET(bl->fd, &rfds);
-           if(bl->ev & EV_WRITE)
-               FD_SET(bl->fd, &wfds);
-           FD_SET(bl->fd, &efds);
-           if(bl->fd > maxfd)
-               maxfd = bl->fd;
-           if((bl->to != 0) && ((timeout == 0) || (timeout > bl->to)))
-               timeout = bl->to;
-       }
-       toval.tv_sec = timeout - now;
-       toval.tv_usec = 0;
-       ret = select(maxfd + 1, &rfds, &wfds, &efds, timeout?(&toval):NULL);
-       if(ret < 0) {
-           if(errno != EINTR) {
-               flog(LOG_CRIT, "ioloop: select errored out: %s", strerror(errno));
-               /* To avoid CPU hogging in case it's bad, which it
-                * probably is. */
-               sleep(1);
-           }
-       }
-       now = time(NULL);
-       for(bl = blockers; bl; bl = nbl) {
-           nbl = bl->n;
-           ev = 0;
-           if(FD_ISSET(bl->fd, &rfds))
-               ev |= EV_READ;
-           if(FD_ISSET(bl->fd, &wfds))
-               ev |= EV_WRITE;
-           if(FD_ISSET(bl->fd, &efds))
-               ev = -1;
-           if((ev < 0) || (ev & bl->ev))
-               resume(bl->th, ev);
-           else if((bl->to != 0) && (bl->to <= now))
-               resume(bl->th, 0);
-       }
-    }
-}
-
 struct stdiofd {
     int fd;
     int sock;
@@ -161,28 +66,35 @@ static ssize_t mtwrite(void *cookie, const char *buf, size_t len)
 {
     struct stdiofd *d = cookie;
     int ev;
+    size_t off;
     ssize_t ret;
     
-    while(1) {
+    off = 0;
+    while(off < len) {
        if(d->sock)
-           ret = send(d->fd, buf, len, MSG_DONTWAIT | MSG_NOSIGNAL);
+           ret = send(d->fd, buf + off, len - off, MSG_DONTWAIT | MSG_NOSIGNAL);
        else
-           ret = write(d->fd, buf, len);
-       if((ret < 0) && (errno == EAGAIN)) {
-           ev = block(d->fd, EV_WRITE, d->timeout);
-           if(ev < 0) {
-               /* If we just go on, we should get the real error. */
-               continue;
-           } else if(ev == 0) {
-               errno = ETIMEDOUT;
-               return(-1);
+           ret = write(d->fd, buf + off, len - off);
+       if(ret < 0) {
+           if(errno == EAGAIN) {
+               ev = block(d->fd, EV_WRITE, d->timeout);
+               if(ev < 0) {
+                   /* If we just go on, we should get the real error. */
+                   continue;
+               } else if(ev == 0) {
+                   errno = ETIMEDOUT;
+                   return(off);
+               } else {
+                   continue;
+               }
            } else {
-               continue;
+               return(off);
            }
        } else {
-           return(ret);
+           off += ret;
        }
     }
+    return(off);
 }
 
 static int mtclose(void *cookie)