#include "portab.h"
-static char UNUSED id[] = "$Id: io.c,v 1.21 2006/09/19 18:21:30 fw Exp $";
+static char UNUSED id[] = "$Id: io.c,v 1.28 2008/01/02 10:29:51 fw Exp $";
#include <assert.h>
#include <stdlib.h>
/* #define DEBUG_IO */
typedef struct {
+#ifdef PROTOTYPES
void (*callback)(int, short);
+#else
+ void (*callback)();
+#endif
short what;
} io_event;
-#define INIT_IOEVENT { NULL, -1, 0, NULL }
-#define IO_ERROR 4
+#define INIT_IOEVENT { NULL, -1, 0, NULL }
+#define IO_ERROR 4
#ifdef HAVE_EPOLL_CREATE
-#define IO_USE_EPOLL 1
+# define IO_USE_EPOLL 1
+# ifdef HAVE_SELECT
+# define IO_USE_SELECT 1
+# endif
#else
-# ifdef HAVE_KQUEUE
-#define IO_USE_KQUEUE 1
-# else
-# ifdef HAVE_SYS_DEVPOLL_H
-#define IO_USE_DEVPOLL 1
-# else
-# ifdef HAVE_POLL
-#define IO_USE_POLL 1
+# ifdef HAVE_KQUEUE
+# define IO_USE_KQUEUE 1
+# else
+# ifdef HAVE_SYS_DEVPOLL_H
+# define IO_USE_DEVPOLL 1
+# else
+# ifdef HAVE_POLL
+# define IO_USE_POLL 1
+# else
+# ifdef HAVE_SELECT
+# define IO_USE_SELECT 1
# else
-#define IO_USE_SELECT 1
+# error "no IO API available!?"
+# endif /* HAVE_SELECT */
# endif /* HAVE_POLL */
# endif /* HAVE_SYS_DEVPOLL_H */
-# endif /* HAVE_KQUEUE */
+# endif /* HAVE_KQUEUE */
#endif /* HAVE_EPOLL_CREATE */
-static bool library_initialized;
+static bool library_initialized = false;
#ifdef IO_USE_EPOLL
#include <sys/epoll.h>
-static int io_masterfd;
+static int io_masterfd = -1;
static bool io_event_change_epoll(int fd, short what, const int action);
static int io_dispatch_epoll(struct timeval *tv);
#endif
static array pollfds;
static int poll_maxfd;
-static bool io_event_change_poll(int fd, short what);
+static bool io_event_change_poll PARAMS((int fd, short what));
#endif
#ifdef IO_USE_DEVPOLL
static fd_set writers;
static int select_maxfd; /* the select() interface sucks badly */
static int io_dispatch_select(struct timeval *tv);
+
+#ifndef IO_USE_EPOLL
+#define io_masterfd -1
#endif
+#endif /* IO_USE_SELECT */
static array io_events;
if (ecreate_hint <= 0)
ecreate_hint = 128;
io_masterfd = epoll_create(ecreate_hint);
- Log(LOG_INFO,
- "IO subsystem: epoll (hint size %d, initial maxfd %u, masterfd %d).",
- ecreate_hint, eventsize, io_masterfd);
- if (io_masterfd >= 0)
+ if (io_masterfd >= 0) {
library_initialized = true;
+ Log(LOG_INFO,
+ "IO subsystem: epoll (hint size %d, initial maxfd %u, masterfd %d).",
+ ecreate_hint, eventsize, io_masterfd);
+ }
}
#endif
eventsize = 0;
#ifdef IO_USE_EPOLL
io_library_init_epoll(eventsize);
+#ifdef IO_USE_SELECT
+ if (io_masterfd < 0)
+ Log(LOG_INFO, "Can't initialize epoll() IO interface, falling back to select() ...");
+#endif
#endif
#ifdef IO_USE_KQUEUE
io_library_init_kqueue(eventsize);
io_library_init_poll(eventsize);
#endif
#ifdef IO_USE_SELECT
- io_library_init_select(eventsize);
+ if (! library_initialized)
+ io_library_init_select(eventsize);
#endif
return library_initialized;
}
FD_ZERO(&writers);
#endif
#ifdef IO_USE_EPOLL
- close(io_masterfd);
+ if (io_masterfd >= 0)
+ close(io_masterfd);
io_masterfd = -1;
#endif
#ifdef IO_USE_KQUEUE
io_event *i;
assert(fd >= 0);
-#if defined(IO_USE_SELECT) || defined(FD_SETSIZE)
+#if defined(IO_USE_SELECT) && defined(FD_SETSIZE)
if (fd >= FD_SETSIZE) {
Log(LOG_ERR,
"fd %d exceeds FD_SETSIZE (%u) (select can't handle more file descriptors)",
ret = io_event_change_kqueue(fd, what, EV_ADD|EV_ENABLE);
#endif
#ifdef IO_USE_SELECT
- ret = io_event_add(fd, what);
+ if (io_masterfd < 0)
+ ret = io_event_add(fd, what);
#endif
if (ret) i->what = what;
return ret;
io_event *i = io_event_get(fd);
if (!i) return false;
- if (i->what == what) return true;
+
+ if ((i->what & what) == what) /* event type is already registered */
+ return true;
#ifdef DEBUG_IO
- Log(LOG_DEBUG, "io_event_add(): fd %d (arg: %d), what %d.", i->fd, fd, what);
+ Log(LOG_DEBUG, "io_event_add(): fd %d, what %d.", fd, what);
#endif
i->what |= what;
#ifdef IO_USE_EPOLL
- return io_event_change_epoll(fd, i->what, EPOLL_CTL_MOD);
+ if (io_masterfd >= 0)
+ return io_event_change_epoll(fd, i->what, EPOLL_CTL_MOD);
#endif
#ifdef IO_USE_KQUEUE
write(io_masterfd, &p, sizeof p);
}
#else
-static inline void io_close_devpoll(int UNUSED x) { /* NOTHING */ }
+static inline void
+io_close_devpoll(int UNUSED x)
+{
+ /* NOTHING */
+}
#endif
io_close_select(int fd)
{
io_event *i;
+
+ if (io_masterfd >= 0) /* Are we using epoll()? */
+ return;
+
FD_CLR(fd, &writers);
FD_CLR(fd, &readers);
}
}
#else
-static inline void io_close_select(int UNUSED x) { /* NOTHING */ }
+static inline void
+io_close_select(int UNUSED x)
+{
+ /* NOTHING */
+}
#endif
#endif
if (!i) return false;
+ if (!(i->what & what)) /* event is already disabled */
+ return true;
+
i->what &= ~what;
#ifdef IO_USE_DEVPOLL
return io_event_change_poll(fd, i->what);
#endif
#ifdef IO_USE_EPOLL
- return io_event_change_epoll(fd, i->what, EPOLL_CTL_MOD);
+ if (io_masterfd >= 0)
+ return io_event_change_epoll(fd, i->what, EPOLL_CTL_MOD);
#endif
#ifdef IO_USE_KQUEUE
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)
- newevents_len = 0;
-#ifdef DEBUG
- if (newevents_len)
- assert(newevents != NULL);
-#endif
- ret = kevent(io_masterfd, newevents, newevents_len, kev,
- 100, &ts);
- if ((newevents_len>0) && ret != -1)
+
+ ret = kevent(io_masterfd, newevents, newevents_len, kev, 100, &ts);
+ if (newevents && ret != -1)
array_trunc(&io_evcache);
total += ret;
return total;
for (i = 0; i < ret; i++) {
- if (kev[i].flags & EV_EOF) {
-#ifdef DEBUG
- LogDebug("kev.flag has EV_EOF set, setting IO_ERROR",
- kev[i].filter, kev[i].ident);
+#ifdef DEBUG_IO
+ LogDebug("fd %d, kev.flags: %x", (int)kev[i].ident, kev[i].flags);
#endif
+ if (kev[i].flags & (EV_EOF|EV_ERROR)) {
+ if (kev[i].flags & EV_ERROR)
+ Log(LOG_ERR, "kevent fd %d: EV_ERROR (%s)",
+ (int)kev[i].ident, strerror((int)kev[i].data));
io_docallback((int)kev[i].ident, IO_ERROR);
continue;
}
switch (kev[i].filter) {
- case EVFILT_READ:
- io_docallback((int)kev[i].ident, IO_WANTREAD);
- break;
- case EVFILT_WRITE:
- io_docallback((int)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((int)kev[i].ident, IO_ERROR);
- break;
+ case EVFILT_READ:
+ io_docallback((int)kev[i].ident, IO_WANTREAD);
+ break;
+ case EVFILT_WRITE:
+ io_docallback((int)kev[i].ident, IO_WANTWRITE);
+ break;
+ default:
+ LogDebug("Unknown kev.filter number %d for fd %d",
+ kev[i].filter, kev[i].ident);
+ /* Fall through */
+ case EV_ERROR:
+ io_docallback((int)kev[i].ident, IO_ERROR);
+ break;
}
}
ts.tv_sec = 0;
int
io_dispatch(struct timeval *tv)
{
+#ifdef IO_USE_EPOLL
+ if (io_masterfd >= 0)
+ return io_dispatch_epoll(tv);
+#endif
#ifdef IO_USE_SELECT
return io_dispatch_select(tv);
#endif
#ifdef IO_USE_POLL
return io_dispatch_poll(tv);
#endif
-#ifdef IO_USE_EPOLL
- return io_dispatch_epoll(tv);
-#endif
}
projects / ngircd-alex.git / blobdiff