projects
/
pazpar2-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Honor max_idle for non-fd IOCHANs
[pazpar2-moved-to-github.git]
/
src
/
eventl.c
diff --git
a/src/eventl.c
b/src/eventl.c
index
a343e93
..
3eff731
100644
(file)
--- a/
src/eventl.c
+++ b/
src/eventl.c
@@
-155,7
+155,7
@@
static int event_loop(iochan_man_t man, IOCHAN *iochans)
FD_ZERO(&out);
FD_ZERO(&except);
timeout = &to; /* hang on select */
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)
to.tv_usec = 0;
max = 0;
for (p = *iochans; p; p = p->next)
@@
-166,6
+166,8
@@
static int event_loop(iochan_man_t man, IOCHAN *iochans)
p->flags = (*p->maskfun)(p);
if (p->socketfun)
p->fd = (*p->socketfun)(p);
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)
if (p->fd < 0)
continue;
if (p->force_event)
@@
-178,8
+180,6
@@
static int event_loop(iochan_man_t man, IOCHAN *iochans)
FD_SET(p->fd, &except);
if (p->fd > max)
max = p->fd;
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)
{
}
if (man->sel_fd != -1)
{
@@
-265,9
+265,9
@@
static int event_loop(iochan_man_t man, IOCHAN *iochans)
{
*nextp = p->next;
xfree(p);
{
*nextp = p->next;
xfree(p);
- break;
}
}
- nextp = &p->next;
+ else
+ nextp = &p->next;
}
}
while (*iochans);
}
}
while (*iochans);