Used glibc to provide mt-blocking stdio for fds.

diff --git a/lib/Makefile.am b/lib/Makefile.am
index c5471a8..74dec1a 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -2,3 +2,4 @@ noinst_LIBRARIES = libht.a
 
 libht_a_SOURCES = utils.c mt.c log.c req.c proc.c mtio.c resp.c
 libht_a_CFLAGS = -fPIC
+libht_a_CPPFLAGS = -D_GNU_SOURCE

diff --git a/lib/mtio.c b/lib/mtio.c
index 3bb7b86..c861261 100644 (file)
--- a/lib/mtio.c
+++ b/lib/mtio.c
@@ -17,11 +17,14 @@
 */
 
 #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
 #include <config.h>
@@ -122,3 +125,94 @@ void ioloop(void)
        }
     }
 }
+
+struct stdiofd {
+    int fd;
+    int sock;
+    int timeout;
+};
+
+static ssize_t mtread(void *cookie, char *buf, size_t len)
+{
+    struct stdiofd *d = cookie;
+    int ev;
+    ssize_t ret;
+    
+    while(1) {
+       ret = read(d->fd, buf, len);
+       if((ret < 0) && (errno == EAGAIN)) {
+           ev = block(d->fd, EV_READ, 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);
+           } else {
+               continue;
+           }
+       } else {
+           return(ret);
+       }
+    }
+}
+
+static ssize_t mtwrite(void *cookie, const char *buf, size_t len)
+{
+    struct stdiofd *d = cookie;
+    int ev;
+    ssize_t ret;
+    
+    while(1) {
+       if(d->sock)
+           ret = send(d->fd, buf, len, 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);
+           } else {
+               continue;
+           }
+       } else {
+           return(ret);
+       }
+    }
+}
+
+static int mtclose(void *cookie)
+{
+    struct stdiofd *d = cookie;
+    
+    close(d->fd);
+    free(d);
+    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;
+    
+    omalloc(d);
+    d->fd = fd;
+    d->sock = issock;
+    d->timeout = timeout;
+    ret = fopencookie(d, mode, iofuns);
+    if(!ret)
+       free(d);
+    else
+       fcntl(fd, F_SETFL, fcntl(fd, F_GETFL) | O_NONBLOCK);
+    return(ret);
+}

diff --git a/lib/mtio.h b/lib/mtio.h
index 32bb0ad..0ae9780 100644 (file)
--- a/lib/mtio.h
+++ b/lib/mtio.h
@@ -6,5 +6,6 @@
 
 int block(int fd, int ev, time_t to);
 void ioloop(void);
+FILE *mtstdopen(int fd, int issock, int timeout, char *mode);
 
 #endif