IO/Poll: fix mistaken variable merge
The events variable is used in the short loop decision. The reasons are not much clear, keeping this to keep the former behaviour.
This commit is contained in:
parent
54bb032d21
commit
ea0a8be2ff
1 changed files with 4 additions and 4 deletions
|
@ -2045,7 +2045,7 @@ io_loop(void)
|
|||
{
|
||||
int poll_tout;
|
||||
time_t tout;
|
||||
int nfds, events;
|
||||
int nfds, events, pout;
|
||||
sock *s;
|
||||
node *n;
|
||||
int fdmax = 256;
|
||||
|
@ -2125,16 +2125,16 @@ io_loop(void)
|
|||
|
||||
/* And finally enter poll() to find active sockets */
|
||||
watchdog_stop();
|
||||
events = poll(pfd, nfds, poll_tout);
|
||||
pout = poll(pfd, nfds, poll_tout);
|
||||
watchdog_start();
|
||||
|
||||
if (events < 0)
|
||||
if (pout < 0)
|
||||
{
|
||||
if (errno == EINTR || errno == EAGAIN)
|
||||
continue;
|
||||
die("poll: %m");
|
||||
}
|
||||
if (events)
|
||||
if (pout)
|
||||
{
|
||||
/* guaranteed to be non-empty */
|
||||
current_sock = SKIP_BACK(sock, n, HEAD(sock_list));
|
||||
|
|
Loading…
Reference in a new issue