From: Willy Tarreau <w@1wt.eu>
Date: Sun, 29 Apr 2007 19:49:00 +0000 (+0200)
Subject: [MINOR] remove wait_time nullification in ev_sepoll
X-Git-Tag: v1.3.10~25
X-Git-Url: http://www.kaiwu.me/postgresql/commit/?a=commitdiff_plain;h=c2c078362a8c8bf9e228bb3530020da2c73aacb1;p=haproxy.git

[MINOR] remove wait_time nullification in ev_sepoll

in ev_sepoll(), wait_time is forced to zero if at least one
speculative event is converted to a real event. This is completely
wrong.
---

diff --git a/src/ev_sepoll.c b/src/ev_sepoll.c
index b7821fb67..24a343e38 100644
--- a/src/ev_sepoll.c
+++ b/src/ev_sepoll.c
@@ -326,11 +326,6 @@ REGPRM2 static void _do_poll(struct poller *p, int wait_time)
 			}
 			epoll_ctl(epoll_fd, opcode, fd, &ev);
 
-			/* We don't want epoll_wait() to wait for certain events
-			 * which might never come.
-			 */
-			wait_time = 0;
-
 			if (status & EPOLLIN) {
 				fd_list[fd].e &= ~FD_EV_MASK_R;
 				fd_list[fd].e |= FD_EV_WAIT_R;