static void run_fun(iochan_man_t man, IOCHAN p)
{
- if (!p->destroyed && p->this_event)
+ if (p->this_event)
{
if (man->sel_thread)
{
{
do /* loop as long as there are active associations to process */
{
- IOCHAN p, nextp;
+ IOCHAN p, *nextp;
fd_set in, out, except;
int res, max;
static struct timeval nullto = {0, 0}, to;
FD_ZERO(&out);
FD_ZERO(&except);
timeout = &to; /* hang on select */
- to.tv_sec = 15;
+ to.tv_sec = 300;
to.tv_usec = 0;
max = 0;
for (p = *iochans; p; p = p->next)
p->flags = (*p->maskfun)(p);
if (p->socketfun)
p->fd = (*p->socketfun)(p);
+ if (p->max_idle && p->max_idle < to.tv_sec)
+ to.tv_sec = p->max_idle;
if (p->fd < 0)
continue;
if (p->force_event)
FD_SET(p->fd, &except);
if (p->fd > max)
max = p->fd;
- if (p->max_idle && p->max_idle < to.tv_sec)
- to.tv_sec = p->max_idle;
}
if (man->sel_fd != -1)
{
int force_event = p->force_event;
time_t now = time(0);
- if (p->thread_users > 0)
+ if (p->thread_users > 0 || p->destroyed)
{
yaz_log(man->log_level, "eventl: skip chan=%p users=%d", p, p->thread_users);
continue;
}
p->this_event = 0;
p->force_event = 0;
- if (!p->destroyed && ((p->max_idle && now - p->last_event >
- p->max_idle) || force_event == EVENT_TIMEOUT))
+
+ if ((p->max_idle && now - p->last_event > p->max_idle)
+ || force_event == EVENT_TIMEOUT)
{
p->last_event = now;
p->this_event |= EVENT_TIMEOUT;
}
if (p->fd >= 0)
{
- if (!p->destroyed && (FD_ISSET(p->fd, &in) ||
- force_event == EVENT_INPUT))
+ if (FD_ISSET(p->fd, &in) || force_event == EVENT_INPUT)
{
p->last_event = now;
yaz_log(YLOG_DEBUG, "Eventl input event");
p->this_event |= EVENT_INPUT;
}
- if (!p->destroyed && (FD_ISSET(p->fd, &out) ||
- force_event == EVENT_OUTPUT))
+ if (FD_ISSET(p->fd, &out) || force_event == EVENT_OUTPUT)
{
p->last_event = now;
yaz_log(YLOG_DEBUG, "Eventl output event");
p->this_event |= EVENT_OUTPUT;
}
- if (!p->destroyed && (FD_ISSET(p->fd, &except) ||
- force_event == EVENT_EXCEPT))
+ if (FD_ISSET(p->fd, &except) || force_event == EVENT_EXCEPT)
{
p->last_event = now;
p->this_event |= EVENT_EXCEPT;
}
run_fun(man, p);
}
- for (p = *iochans; p; p = nextp)
- {
- nextp = p->next;
-
+ for (nextp = iochans; *nextp; )
+ {
+ IOCHAN p = *nextp;
if (p->destroyed && p->thread_users == 0)
{
- IOCHAN tmp = p, pr;
-
- /* Now reset the pointers */
- if (p == *iochans)
- *iochans = p->next;
- else
- {
- for (pr = *iochans; pr; pr = pr->next)
- if (pr->next == p)
- break;
- assert(pr); /* grave error if it weren't there */
- pr->next = p->next;
- }
- if (nextp == p)
- nextp = p->next;
- xfree(tmp);
+ *nextp = p->next;
+ xfree(p);
}
- }
+ else
+ nextp = &p->next;
+ }
}
while (*iochans);
return 0;