From: Fredrik Tolf Date: Wed, 9 Mar 2011 00:00:21 +0000 (+0100) Subject: Merge branch 'master' of git.dolda2000.com:/srv/git/r/ashd X-Git-Tag: 0.7~1^2~2 X-Git-Url: http://www.dolda2000.com/gitweb/?p=ashd.git;a=commitdiff_plain;h=be078ac9feafbf0eb7547ea14bb2e73936caa60c Merge branch 'master' of git.dolda2000.com:/srv/git/r/ashd Conflicts: lib/mtio.c --- be078ac9feafbf0eb7547ea14bb2e73936caa60c diff --cc lib/mtio-epoll.c index 0000000,940ba3d..8510c5e mode 000000,100644..100644 --- a/lib/mtio-epoll.c +++ b/lib/mtio-epoll.c @@@ -1,0 -1,218 +1,220 @@@ + /* + ashd - A Sane HTTP Daemon + Copyright (C) 2008 Fredrik Tolf + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + */ + + #include ++#include + #include + #include + #include + + #ifdef HAVE_CONFIG_H + #include + #endif + #include + #include + #include + #include + + static struct blocker *blockers; + + struct blocker { + struct blocker *n, *p, *n2, *p2; + int fd, reg; + int ev; + time_t to; + struct muth *th; + }; + + static int epfd = -1, fdln = 0; + static struct blocker **fdlist; + + static int regfd(struct blocker *bl) + { + struct blocker *o; + struct epoll_event evd; + + memset(&evd, 0, sizeof(evd)); + evd.events = 0; + if(bl->ev & EV_READ) + evd.events |= EPOLLIN; + if(bl->ev & EV_WRITE) + evd.events |= EPOLLOUT; + evd.data.fd = bl->fd; + if(bl->fd >= fdln) { + if(fdlist) { + fdlist = srealloc(fdlist, sizeof(*fdlist) * (bl->fd + 1)); + memset(fdlist + fdln, 0, sizeof(*fdlist) * (bl->fd + 1 - fdln)); + fdln = bl->fd + 1; + } else { + fdlist = szmalloc(sizeof(*fdlist) * (fdln = (bl->fd + 1))); + } + } + if(fdlist[bl->fd] == NULL) { + if(epoll_ctl(epfd, EPOLL_CTL_ADD, bl->fd, &evd)) { + /* XXX?! Whatever to do, really? */ + flog(LOG_ERR, "epoll_add on fd %i: %s", bl->fd, strerror(errno)); + return(-1); + } + } else { + for(o = fdlist[bl->fd]; o; o = o->n2) { + if(o->ev & EV_READ) + evd.events |= EPOLLIN; + if(o->ev & EV_WRITE) + evd.events |= EPOLLOUT; + } + if(epoll_ctl(epfd, EPOLL_CTL_MOD, bl->fd, &evd)) { + /* XXX?! Whatever to do, really? */ + flog(LOG_ERR, "epoll_mod on fd %i: %s", bl->fd, strerror(errno)); + return(-1); + } + } + bl->n2 = fdlist[bl->fd]; + bl->p2 = NULL; + if(fdlist[bl->fd] != NULL) + fdlist[bl->fd]->p2 = bl; + fdlist[bl->fd] = bl; + bl->reg = 1; + return(0); + } + + static void remfd(struct blocker *bl) + { + struct blocker *o; + struct epoll_event evd; + + if(!bl->reg) + return; + if(bl->n2) + bl->n2->p2 = bl->p2; + if(bl->p2) + bl->p2->n2 = bl->n2; + if(bl == fdlist[bl->fd]) + fdlist[bl->fd] = bl->n2; + if(fdlist[bl->fd] == NULL) { + if(epoll_ctl(epfd, EPOLL_CTL_DEL, bl->fd, NULL)) + flog(LOG_ERR, "epoll_del on fd %i: %s", bl->fd, strerror(errno)); + } else { + memset(&evd, 0, sizeof(evd)); + evd.events = 0; + evd.data.fd = bl->fd; + for(o = fdlist[bl->fd]; o; o = o->n2) { + if(o->ev & EV_READ) + evd.events |= EPOLLIN; + if(o->ev & EV_WRITE) + evd.events |= EPOLLOUT; + } + if(epoll_ctl(epfd, EPOLL_CTL_MOD, bl->fd, &evd)) { + /* XXX?! Whatever to do, really? */ + flog(LOG_ERR, "epoll_mod on fd %i: %s", bl->fd, strerror(errno)); + } + } + } + + 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; + if((epfd >= 0) && regfd(bl)) { + free(bl); + return(-1); + } + 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; + remfd(bl); + free(bl); + return(rv); + } + + void ioloop(void) + { + struct blocker *bl, *nbl; + struct epoll_event evr[16]; + int i, fd, nev, ev, toval; + time_t now, timeout; + + epfd = epoll_create(128); ++ fcntl(epfd, F_SETFD, FD_CLOEXEC); + for(bl = blockers; bl; bl = nbl) { + nbl = bl->n; + if(regfd(bl)) + resume(bl->th, -1); + } + while(blockers != NULL) { + timeout = 0; + for(bl = blockers; bl; bl = bl->n) { + if((bl->to != 0) && ((timeout == 0) || (timeout > bl->to))) + timeout = bl->to; + } + now = time(NULL); + if(timeout == 0) + toval = -1; + else if(timeout > now) + toval = (timeout - now) * 1000; + else + toval = 1000; + nev = epoll_wait(epfd, evr, sizeof(evr) / sizeof(*evr), toval); + if(nev < 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); + } + continue; + } + for(i = 0; i < nev; i++) { + fd = evr[i].data.fd; + ev = 0; + if(evr[i].events & EPOLLIN) + ev |= EV_READ; + if(evr[i].events & EPOLLOUT) + ev |= EV_WRITE; + if(evr[i].events & ~(EPOLLIN | EPOLLOUT)) + ev = -1; + for(bl = fdlist[fd]; bl; bl = nbl) { + nbl = bl->n2; + if((ev < 0) || (ev & bl->ev)) + resume(bl->th, ev); + } + } + now = time(NULL); + for(bl = blockers; bl; bl = nbl) { + nbl = bl->n; + if((bl->to != 0) && (bl->to <= now)) + resume(bl->th, 0); + } + } + close(epfd); + epfd = -1; + }