From a6cda4ddc2f2d2009602a2e5a30275cb09e0d09e Mon Sep 17 00:00:00 2001
From: Fredrik Tolf <fredrik@dolda2000.com>
Date: Tue, 8 Mar 2011 07:05:40 +0100
Subject: [PATCH] lib: Split epoll and select loops into separate files.
---
configure.in | 1 +
lib/Makefile.am | 9 +-
lib/mtio-epoll.c | 218 +++++++++++++++++++++++++++++++++++++++
lib/mtio-select.c | 123 ++++++++++++++++++++++
lib/mtio.c | 298 ------------------------------------------------------
5 files changed, 349 insertions(+), 300 deletions(-)
create mode 100644 lib/mtio-epoll.c
create mode 100644 lib/mtio-select.c
diff --git a/configure.in b/configure.in
index 38327ad..d3d1e4f 100644
--- a/configure.in
+++ b/configure.in
@@ -39,6 +39,7 @@ fi
if test "$HAS_EPOLL" = yes; then
AC_DEFINE(HAVE_EPOLL)
fi
+AM_CONDITIONAL(USE_EPOLL, [test "$HAS_EPOLL" = yes ])
AH_TEMPLATE(HAVE_XATTR, [define to compile support for filesystem extended attributes])
AC_ARG_WITH(xattr, [ --with-xattr Enable XATTR support])
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 4cfeaa2..d48cfb6 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,7 +1,12 @@
lib_LIBRARIES = libht.a
libht_a_SOURCES = utils.c mt.c log.c req.c proc.c mtio.c resp.c cf.c
-libht_a_CFLAGS = -fPIC
-libht_a_CPPFLAGS = -D_GNU_SOURCE
+libht_a_CFLAGS = -fPIC
+libht_a_CPPFLAGS = -D_GNU_SOURCE
+if USE_EPOLL
+libht_a_SOURCES += mtio-epoll.c
+else
+libht_a_SOURCES += mtio-select.c
+endif
pkginclude_HEADERS = utils.h mt.h log.h req.h proc.h mtio.h resp.h cf.h
diff --git a/lib/mtio-epoll.c b/lib/mtio-epoll.c
new file mode 100644
index 0000000..940ba3d
--- /dev/null
+++ b/lib/mtio-epoll.c
@@ -0,0 +1,218 @@
+/*
+ ashd - A Sane HTTP Daemon
+ Copyright (C) 2008 Fredrik Tolf <fredrik@dolda2000.com>
+
+ 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 <http://www.gnu.org/licenses/>.
+*/
+
+#include <stdlib.h>
+#include <string.h>
+#include <sys/epoll.h>
+#include <errno.h>
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include <log.h>
+#include <utils.h>
+#include <mt.h>
+#include <mtio.h>
+
+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);
+ 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;
+}
diff --git a/lib/mtio-select.c b/lib/mtio-select.c
new file mode 100644
index 0000000..eb84a45
--- /dev/null
+++ b/lib/mtio-select.c
@@ -0,0 +1,123 @@
+/*
+ ashd - A Sane HTTP Daemon
+ Copyright (C) 2008 Fredrik Tolf <fredrik@dolda2000.com>
+
+ 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 <http://www.gnu.org/licenses/>.
+*/
+
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+#include <sys/select.h>
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include <log.h>
+#include <utils.h>
+#include <mt.h>
+#include <mtio.h>
+
+static struct blocker *blockers;
+
+struct blocker {
+ struct blocker *n, *p;
+ int fd;
+ int ev;
+ time_t to;
+ struct muth *th;
+};
+
+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;
+ free(bl);
+ 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);
+ }
+ }
+}
diff --git a/lib/mtio.c b/lib/mtio.c
index b594f0d..43cc1f7 100644
--- 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,301 +31,6 @@
#include <mt.h>
#include <mtio.h>
-static struct blocker *blockers;
-
-#ifdef HAVE_EPOLL
-
-/*
- * Support for epoll. Optimally, different I/O loops should be split
- * into different files for greater clarity, but I'll save that fun
- * for another day.
- *
- * Scroll down to #else for the normal select loop.
- */
-
-#include <sys/epoll.h>
-
-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);
- 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;
-}
-
-#else
-
-struct blocker {
- struct blocker *n, *p;
- int fd;
- int ev;
- time_t to;
- struct muth *th;
-};
-
-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;
- free(bl);
- 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);
- }
- }
-}
-
-#endif
-
struct stdiofd {
int fd;
int sock;
--
2.11.0