RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-01-05 03:29:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

[BUG] fix null timeouts in *poll-based pollers

Browse Source 
Introduction of timeval timers broke *poll-based pollers, because the call to
tv_ms_remain may return 0 while the event is not elapsed yet. Now we carefully
check for those cases and round the result up by 1 ms.
This commit is contained in:
Willy Tarreau 2007-05-14 02:02:04 +02:00
parent aff694f3b6
commit bdefc513a0
3 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/ev_epoll.c
View File

@ -231,10 +231,12 @@ REGPRM2 static void _do_poll(struct poller *p, struct timeval *exp)
fd_flush_changes();
/* now let's wait for events */
if (tv_isset(exp))
wait_time = tv_ms_remain(&now, exp);
else
if (tv_iseternity(exp))
wait_time = -1;
else if (tv_isge(&now, exp))
wait_time = 0;
else
wait_time = __tv_ms_elapsed(&now, exp) + 1;
status = epoll_wait(epoll_fd, epoll_events, maxfd, wait_time);
tv_now(&now);

8
src/ev_poll.c
View File

@ -124,10 +124,12 @@ REGPRM2 static void _do_poll(struct poller *p, struct timeval *exp)
}
/* now let's wait for events */
if (tv_isset(exp))
wait_time = tv_ms_remain(&now, exp);
else
if (tv_iseternity(exp))
wait_time = -1;
else if (tv_isge(&now, exp))
wait_time = 0;
else
wait_time = __tv_ms_elapsed(&now, exp) + 1;
status = poll(poll_events, nbfd, wait_time);
tv_now(&now);

8
src/ev_sepoll.c
View File

@ -380,10 +380,12 @@ REGPRM2 static void _do_poll(struct poller *p, struct timeval *exp)
wait_time = 0;
}
else {
if (tv_isset(exp))
wait_time = tv_ms_remain(&now, exp);
else
if (tv_iseternity(exp))
wait_time = -1;
else if (tv_isge(&now, exp))
wait_time = 0;
else
wait_time = __tv_ms_elapsed(&now, exp) + 1;
}
/* now let's wait for real events */