X-Git-Url: http://git.dolda2000.com/gitweb/?a=blobdiff_plain;ds=inline;f=lib%2Fmtio.c;h=b994cc20761aee71953e5eeb0c57db25aad9f2a5;hb=945d02f51b66c1ca7b8ae959cd06b4f9ebbd0954;hp=1727d437dfd514555403dc4af4eb717ce977ca89;hpb=9dc25d3d8337f3e9ecc31530f3be10b9ecf07422;p=ashd.git
diff --git a/lib/mtio.c b/lib/mtio.c
index 1727d43..b994cc2 100644
--- a/lib/mtio.c
+++ b/lib/mtio.c
@@ -16,116 +16,22 @@
along with this program. If not, see .
*/
+#ifdef HAVE_CONFIG_H
+#include
+#endif
#include
#include
-#include
#include
+#include
#include
-#include
#include
-#include
#include
-#ifdef HAVE_CONFIG_H
-#include
-#endif
#include
#include
#include
#include
-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;
@@ -201,6 +107,7 @@ static int mtclose(void *cookie)
return(0);
}
+#ifdef HAVE_GLIBC_STDIO
static cookie_io_functions_t iofuns = {
.read = mtread,
.write = mtwrite,
@@ -223,3 +130,6 @@ FILE *mtstdopen(int fd, int issock, int timeout, char *mode)
fcntl(fd, F_SETFL, fcntl(fd, F_GETFL) | O_NONBLOCK);
return(ret);
}
+#else
+#error "No stdio implementation for this system"
+#endif