#include "portab.h"
-static char UNUSED id[] = "$Id: io.c,v 1.1 2005/07/07 18:38:35 fw Exp $";
+static char UNUSED id[] = "$Id: io.c,v 1.12 2006/05/07 10:54:42 fw Exp $";
#include <assert.h>
#include <stdlib.h>
#endif
#endif
+static bool library_initialized;
#ifdef IO_USE_EPOLL
#include <sys/epoll.h>
static int io_masterfd;
-static bool io_event_new_epoll(int fd, short what);
-static bool io_event_change_epoll(int fd, short what);
+static bool io_event_change_epoll(int fd, short what, const int action);
static int io_dispatch_epoll(struct timeval *tv);
#endif
static int io_masterfd;
static int io_dispatch_kqueue(struct timeval *tv);
-static bool io_event_add_kqueue(int, short);
+static bool io_event_change_kqueue(int, short, const int action);
#endif
#ifdef IO_USE_SELECT
i = (io_event *) array_get(&io_events, sizeof(io_event), fd);
assert(i);
- if (!i) {
-#ifdef DEBUG
- Log(LOG_DEBUG, "io_event_add(): EMPTY FOR fd %d", fd);
-#endif
- return NULL;
- }
return i;
}
bool
io_library_init(unsigned int eventsize)
{
+ bool ret;
#ifdef IO_USE_EPOLL
int ecreate_hint = (int)eventsize;
if (ecreate_hint <= 0)
ecreate_hint = 128;
#endif
+ if (library_initialized)
+ return true;
#ifdef IO_USE_SELECT
#ifdef FD_SETSIZE
#ifdef IO_USE_EPOLL
io_masterfd = epoll_create(ecreate_hint);
Log(LOG_INFO,
- "io subsystem: using epoll (hint size %d), initial io_event maxfd: %u, io_masterfd %d",
+ "IO subsystem: epoll (hint size %d, initial maxfd %u, masterfd %d).",
ecreate_hint, eventsize, io_masterfd);
- return io_masterfd >= 0;
+ ret = io_masterfd >= 0;
+ if (ret) library_initialized = true;
+
+ return ret;
#endif
#ifdef IO_USE_SELECT
- Log(LOG_INFO, "io subsystem: using select, initial io_event maxfd: %u",
+ Log(LOG_INFO, "IO subsystem: select (initial maxfd %u).",
eventsize);
FD_ZERO(&readers);
FD_ZERO(&writers);
#ifdef FD_SETSIZE
if (Conf_MaxConnections >= FD_SETSIZE) {
Log(LOG_WARNING,
- "Conf_MaxConnections (%d) exceeds limit (%u), changed Conf_MaxConnections to %u",
+ "MaxConnections (%d) exceeds limit (%u), changed MaxConnections to %u.",
Conf_MaxConnections, FD_SETSIZE, FD_SETSIZE - 1);
Conf_MaxConnections = FD_SETSIZE - 1;
}
#else
Log(LOG_WARNING,
- "FD_SETSIZE undefined, don't know how many descriptors select() can handle on your platform");
-#endif
+ "FD_SETSIZE undefined, don't know how many descriptors select() can handle on your platform ...");
+#endif /* FD_SETSIZE */
+ library_initialized = true;
return true;
-#endif
+#endif /* SELECT */
#ifdef IO_USE_KQUEUE
io_masterfd = kqueue();
Log(LOG_INFO,
- "io subsystem: using kqueue, initial io_event maxfd: %u, io_masterfd %d",
+ "IO subsystem: kqueue (initial maxfd %u, masterfd %d)",
eventsize, io_masterfd);
- return io_masterfd >= 0;
+ ret = io_masterfd >= 0;
+ if (ret) library_initialized = true;
+
+ return ret;
#endif
}
-bool
+void
io_library_shutdown(void)
{
- unsigned int len = array_length(&io_events, sizeof(io_event));
-
- while (len--) {
- if (NULL == io_event_get(len))
- continue;
- }
-#ifndef IO_USE_SELECT
- close(io_masterfd); /* kqueue, epoll */
- io_masterfd = -1;
-#else
+#ifdef IO_USE_SELECT
FD_ZERO(&readers);
FD_ZERO(&writers);
+#else
+ close(io_masterfd); /* kqueue, epoll */
+ io_masterfd = -1;
#endif
#ifdef IO_USE_KQUEUE
array_free(&io_evcache);
#endif
- return true;
+ library_initialized = false;
}
bool
io_event_create(int fd, short what, void (*cbfunc) (int, short))
{
+ bool ret;
io_event *i;
assert(fd >= 0);
i->fd = fd;
i->callback = cbfunc;
+ i->what = 0;
#ifdef IO_USE_EPOLL
- i->what = what;
- return io_event_new_epoll(fd, what);
+ ret = io_event_change_epoll(fd, what, EPOLL_CTL_ADD);
#endif
#ifdef IO_USE_KQUEUE
- i->what = what;
- return io_event_add_kqueue(fd, what);
+ ret = io_event_change_kqueue(fd, what, EV_ADD|EV_ENABLE);
#endif
#ifdef IO_USE_SELECT
- i->what = 0;
- return io_event_add(fd, what);
+ ret = io_event_add(fd, what);
#endif
+ if (ret) i->what = what;
+ return ret;
}
#ifdef IO_USE_EPOLL
static bool
-io_event_new_epoll(int fd, short what)
-{
- struct epoll_event ev = { 0, {0} };
- ev.data.fd = fd;
-
- if (what & IO_WANTREAD)
- ev.events = EPOLLIN | EPOLLPRI;
- if (what & IO_WANTWRITE)
- ev.events |= EPOLLOUT;
-
- return epoll_ctl(io_masterfd, EPOLL_CTL_ADD, fd, &ev) == 0;
-}
-
-
-static bool
-io_event_change_epoll(int fd, short what)
+io_event_change_epoll(int fd, short what, const int action)
{
struct epoll_event ev = { 0, {0} };
ev.data.fd = fd;
if (what & IO_WANTWRITE)
ev.events |= EPOLLOUT;
- return epoll_ctl(io_masterfd, EPOLL_CTL_MOD, fd, &ev) == 0;
+ return epoll_ctl(io_masterfd, action, fd, &ev) == 0;
}
#endif
static bool
-io_event_add_kqueue(int fd, short what)
+io_event_change_kqueue(int fd, short what, const int action)
{
struct kevent kev;
- short filter = 0;
- unsigned int len = array_length(&io_evcache, sizeof kev);
- bool ret;
-
- if (what & IO_WANTREAD)
- filter = EVFILT_READ;
-
- if (what & IO_WANTWRITE)
- filter |= EVFILT_WRITE;
-
- if (len >= 100) {
- ret = io_event_kqueue_commit_cache();
- if (ret)
- array_trunc(&io_evcache);
+ bool ret = true;
+
+ if (what & IO_WANTREAD) {
+ EV_SET(&kev, fd, EVFILT_READ, action, 0, 0, 0);
+ ret = array_catb(&io_evcache, (char*) &kev, sizeof (kev));
+ if (!ret)
+ ret = kevent(io_masterfd, &kev,1, NULL, 0, NULL) == 0;
+ }
+
+ if (ret && (what & IO_WANTWRITE)) {
+ EV_SET(&kev, fd, EVFILT_WRITE, action, 0, 0, 0);
+ ret = array_catb(&io_evcache, (char*) &kev, sizeof (kev));
+ if (!ret)
+ ret = kevent(io_masterfd, &kev, 1, NULL, 0, NULL) == 0;
}
- EV_SET(&kev, fd, filter, EV_ADD | EV_ENABLE, 0, 0, NULL);
- return array_catb(&io_evcache, (char*) &kev, sizeof (kev));
+ if (array_length(&io_evcache, sizeof kev) >= 100)
+ io_event_kqueue_commit_cache();
+ return ret;
}
#endif
{
io_event *i = io_event_get(fd);
- assert(i);
+ assert(i != NULL);
- if (!i)
- return false;
- if (i->what == what)
- return true;
+ if (!i) return false;
+ if (i->what == what) return true;
#ifdef DEBUG
- Log(LOG_DEBUG, "io_event_add(): fd %d (arg: %d), what %d.", i->fd, fd,
- what);
+ Log(LOG_DEBUG, "io_event_add(): fd %d (arg: %d), what %d.", i->fd, fd, what);
#endif
-
i->what |= what;
-
#ifdef IO_USE_EPOLL
- return io_event_change_epoll(fd, i->what);
+ return io_event_change_epoll(fd, i->what, EPOLL_CTL_MOD);
#endif
#ifdef IO_USE_KQUEUE
- return io_event_add_kqueue(fd, what);
+ return io_event_change_kqueue(fd, what, EV_ADD | EV_ENABLE);
#endif
#ifdef IO_USE_SELECT
bool
io_close(int fd)
{
- io_event *i = io_event_get(fd);
- if (i) {
- memset(i, 0, sizeof(io_event));
- i->fd = -1;
- }
+ io_event *i;
#ifdef IO_USE_SELECT
FD_CLR(fd, &writers);
FD_CLR(fd, &readers);
- if (fd == select_maxfd)
- select_maxfd--;
+ if (fd == select_maxfd) {
+ while (select_maxfd>0) {
+ --select_maxfd; /* find largest fd */
+ i = io_event_get(select_maxfd);
+ if (i && (i->fd >= 0)) break;
+ }
+ }
#endif
+ i = io_event_get(fd);
#ifdef IO_USE_KQUEUE
if (array_length(&io_evcache, sizeof (struct kevent))) /* pending data in cache? */
io_event_kqueue_commit_cache();
+
+ /* both kqueue and epoll remove fd from all sets automatically on the last close
+ * of the descriptor. since we don't know if this is the last close we'll have
+ * to remove the set explicitly. */
+ if (i) {
+ io_event_change_kqueue(fd, i->what, EV_DELETE);
+ io_event_kqueue_commit_cache();
+ }
+#endif
+#ifdef IO_USE_EPOLL
+ io_event_change_epoll(fd, 0, EPOLL_CTL_DEL);
#endif
- return close(fd) == 0; /* both epoll an kqueue will remove fd from all sets automatically */
+ if (i) {
+ memset(i, 0, sizeof(io_event));
+ i->fd = -1;
+ }
+ return close(fd) == 0;
}
bool
io_event_del(int fd, short what)
{
-#ifdef IO_USE_KQUEUE
- struct kevent kev;
- short filter = 0;
-#endif
io_event *i = io_event_get(fd);
#ifdef DEBUG
- Log(LOG_DEBUG, "io_event_del(): trying to delete eventtype %d on fd %d",
- what, fd);
+ Log(LOG_DEBUG, "io_event_del(): trying to delete eventtype %d on fd %d", what, fd);
#endif
- assert(i);
- if (!i)
- return true;
+ assert(i != NULL);
+ if (!i) return false;
i->what &= ~what;
#ifdef IO_USE_EPOLL
- return io_event_change_epoll(fd, i->what);
+ return io_event_change_epoll(fd, i->what, EPOLL_CTL_MOD);
#endif
#ifdef IO_USE_KQUEUE
- if (what & IO_WANTREAD)
- filter = EVFILT_READ;
-
- if (what & IO_WANTWRITE)
- filter |= EVFILT_WRITE;
-
- EV_SET(&kev, fd, filter, EV_DELETE, 0, 0, NULL);
- return kevent(io_masterfd, &kev, 1, NULL, 0, NULL) == 0;
+ return io_event_change_kqueue(fd, what, EV_DISABLE);
#endif
-
#ifdef IO_USE_SELECT
if (what & IO_WANTWRITE)
FD_CLR(i->fd, &writers);
{
int i, total = 0, ret;
struct kevent kev[100];
- struct kevents *newevents;
+ struct kevent *newevents;
struct timespec ts;
int newevents_len;
- short type;
ts.tv_sec = tv->tv_sec;
ts.tv_nsec = tv->tv_usec * 1000;
do {
- newevents_len = array_length(&io_evcache, sizeof (struct kevent));
+ newevents_len = (int) array_length(&io_evcache, sizeof (struct kevent));
newevents = (newevents_len > 0) ? array_start(&io_evcache) : NULL;
assert(newevents_len >= 0);
if (newevents_len < 0)
if (newevents_len)
assert(newevents);
#endif
-
- ret = kevent(io_masterfd, newevents, newevents_len, kev, 100, &ts);
+ ret = kevent(io_masterfd, newevents, newevents_len, kev,
+ 100, &ts);
if ((newevents_len>0) && ret != -1)
array_trunc(&io_evcache);
return total;
for (i = 0; i < ret; i++) {
- type = 0;
- if (kev[i].flags & EV_EOF)
- type = IO_ERROR;
-
- if (kev[i].filter & EV_ERROR)
- type = IO_ERROR;
-
- if (kev[i].filter & EVFILT_READ)
- type |= IO_WANTREAD;
+ switch (kev[i].filter) {
+ case EVFILT_READ:
+ io_docallback(kev[i].ident, IO_WANTREAD);
+ break;
+ case EVFILT_WRITE:
+ io_docallback(kev[i].ident, IO_WANTWRITE);
+ break;
+ default:
+#ifdef DEBUG
+ LogDebug("Unknown kev.filter number %d for fd %d",
+ kev[i].filter, kev[i].ident); /* Fall through */
+#endif
+ case EV_ERROR:
+ io_docallback(kev[i].ident, IO_ERROR);
+ break;
+
+ }
+ if (kev[i].flags & EV_EOF) {
+#ifdef DEBUG
+ LogDebug("kev.flag has EV_EOF set, setting IO_ERROR",
+ kev[i].filter, kev[i].ident); /* Fall through */
- if (kev[i].filter & EVFILT_WRITE)
- type |= IO_WANTWRITE;
+#endif
+ io_docallback(kev[i].ident, IO_ERROR);
- io_docallback(kev[i].ident, type);
+ }
}
-
ts.tv_sec = 0;
ts.tv_nsec = 0;
-
} while (ret == 100);
return total;
projects / ngircd-alex.git / blobdiff