* Based on revision YAZ' server/eventl.c 1.29.
*/
-#include <stdio.h>
-#include <assert.h>
-
#if HAVE_CONFIG_H
#include <config.h>
#endif
+#include <stdio.h>
+#include <assert.h>
+
#ifdef WIN32
#include <winsock.h>
#else
new_iochan->fd = fd;
new_iochan->flags = flags;
new_iochan->fun = cb;
+ new_iochan->socketfun = NULL;
+ new_iochan->maskfun = NULL;
new_iochan->force_event = 0;
new_iochan->last_event = new_iochan->max_idle = 0;
new_iochan->next = NULL;
max = 0;
for (p = *iochans; p; p = p->next)
{
+ if (p->maskfun)
+ p->flags = (*p->maskfun)(p);
+ if (p->socketfun)
+ p->fd = (*p->socketfun)(p);
if (p->fd < 0)
continue;
if (p->force_event)
if (p->max_idle && p->max_idle < to.tv_sec)
to.tv_sec = p->max_idle;
}
- if ((res = select(max + 1, &in, &out, &except, timeout)) < 0)
+ res = select(max + 1, &in, &out, &except, timeout);
+ if (res < 0)
{
if (errno == EINTR)
continue;
else
- abort();
+ {
+ yaz_log(YLOG_ERRNO|YLOG_WARN, "select");
+ return 0;
+ }
}
for (p = *iochans; p; p = p->next)
{
force_event == EVENT_INPUT))
{
p->last_event = now;
+ yaz_log(YLOG_DEBUG, "Eventl input event");
(*p->fun)(p, EVENT_INPUT);
}
if (!p->destroyed && (FD_ISSET(p->fd, &out) ||
force_event == EVENT_OUTPUT))
{
p->last_event = now;
+ yaz_log(YLOG_DEBUG, "Eventl output event");
(*p->fun)(p, EVENT_OUTPUT);
}
if (!p->destroyed && (FD_ISSET(p->fd, &except) ||