Dolda2000 GitWeb
/
ashd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
5ab220d
)
lib: Fixed epoll loop timeout bug.
author
Fredrik Tolf
<fredrik@dolda2000.com>
Sat, 29 Jan 2011 03:56:22 +0000
(
04:56
+0100)
committer
Fredrik Tolf
<fredrik@dolda2000.com>
Sat, 29 Jan 2011 03:56:22 +0000
(
04:56
+0100)
lib/mtio.c
patch
|
blob
|
blame
|
history
diff --git
a/lib/mtio.c
b/lib/mtio.c
index
b65a8b0
..
b594f0d
100644
(file)
--- a/
lib/mtio.c
+++ b/
lib/mtio.c
@@
-176,7
+176,7
@@
void ioloop(void)
{
struct blocker *bl, *nbl;
struct epoll_event evr[16];
{
struct blocker *bl, *nbl;
struct epoll_event evr[16];
- int i, fd, nev, ev;
+ int i, fd, nev, ev
, toval
;
time_t now, timeout;
epfd = epoll_create(128);
time_t now, timeout;
epfd = epoll_create(128);
@@
-192,7
+192,13
@@
void ioloop(void)
timeout = bl->to;
}
now = time(NULL);
timeout = bl->to;
}
now = time(NULL);
- nev = epoll_wait(epfd, evr, sizeof(evr) / sizeof(*evr), timeout?((timeout - now) * 1000):-1);
+ if(timeout == 0)
+ toval = -1;
+ else if(timeout > now)
+ toval = (timeout - now) * 1000;
+ else
+ toval = 1000;
+ nev = epoll_wait(epfd, evr, sizeof(evr) / sizeof(*evr), toval);
if(nev < 0) {
if(errno != EINTR) {
flog(LOG_CRIT, "ioloop: select errored out: %s", strerror(errno));
if(nev < 0) {
if(errno != EINTR) {
flog(LOG_CRIT, "ioloop: select errored out: %s", strerror(errno));
@@
-202,7
+208,6
@@
void ioloop(void)
}
continue;
}
}
continue;
}
- now = time(NULL);
for(i = 0; i < nev; i++) {
fd = evr[i].data.fd;
ev = 0;
for(i = 0; i < nev; i++) {
fd = evr[i].data.fd;
ev = 0;
@@
-216,10
+221,14
@@
void ioloop(void)
nbl = bl->n2;
if((ev < 0) || (ev & bl->ev))
resume(bl->th, ev);
nbl = bl->n2;
if((ev < 0) || (ev & bl->ev))
resume(bl->th, ev);
- else if((bl->to != 0) && (bl->to <= now))
- resume(bl->th, 0);
}
}
}
}
+ now = time(NULL);
+ for(bl = blockers; bl; bl = nbl) {
+ nbl = bl->n;
+ if((bl->to != 0) && (bl->to <= now))
+ resume(bl->th, 0);
+ }
}
close(epfd);
epfd = -1;
}
close(epfd);
epfd = -1;