lib: Introduced a portable abstraction layer for custom stdio streams.

[ashd.git] / lib / mtio.c

diff --git a/lib/mtio.c b/lib/mtio.c
index 1727d43..1f4a579 100644 (file)
--- a/lib/mtio.c
+++ b/lib/mtio.c
@@ -16,123 +16,29 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <stdlib.h>
 #include <stdio.h>
-#include <fcntl.h>
 #include <unistd.h>
+#include <fcntl.h>
 #include <string.h>
-#include <time.h>
 #include <errno.h>
-#include <sys/select.h>
 #include <sys/socket.h>
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
 #include <log.h>
 #include <utils.h>
 #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;
     int timeout;
 };
 
-static ssize_t mtread(void *cookie, char *buf, size_t len)
+static ssize_t mtread(void *cookie, void *buf, size_t len)
 {
     struct stdiofd *d = cookie;
     int ev;
@@ -157,7 +63,7 @@ static ssize_t mtread(void *cookie, char *buf, size_t len)
     }
 }
 
-static ssize_t mtwrite(void *cookie, const char *buf, size_t len)
+static ssize_t mtwrite(void *cookie, const void *buf, size_t len)
 {
     struct stdiofd *d = cookie;
     int ev;
@@ -201,22 +107,26 @@ static int mtclose(void *cookie)
     return(0);
 }
 
-static cookie_io_functions_t iofuns = {
-    .read = mtread,
-    .write = mtwrite,
-    .close = mtclose,
-};
-
 FILE *mtstdopen(int fd, int issock, int timeout, char *mode)
 {
     struct stdiofd *d;
     FILE *ret;
+    int r, w;
     
+    if(!strcmp(mode, "r")) {
+       r = 1; w = 0;
+    } else if(!strcmp(mode, "w")) {
+       r = 0; w = 1;
+    } else if(!strcmp(mode, "r+")) {
+       r = w = 1;
+    } else {
+       return(NULL);
+    }
     omalloc(d);
     d->fd = fd;
     d->sock = issock;
     d->timeout = timeout;
-    ret = fopencookie(d, mode, iofuns);
+    ret = funstdio(d, r?mtread:NULL, w?mtwrite:NULL, NULL, mtclose);
     if(!ret)
        free(d);
     else