mirrors/bird
mirrors/bird
0
0
Fork 0
mirror of https://gitlab.nic.cz/labs/bird.git synced 2024-12-22 09:41:54 +00:00
Code Releases Activity

IO/Poll: fix mistaken variable merge

Browse Source 
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:
Jan Moskyto Matejka 2016-03-30 16:21:32 +02:00
parent 54bb032d21
commit ea0a8be2ff
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sysdep/unix/io.c
View File

@ -2045,7 +2045,7 @@ io_loop(void)
{ {
int poll_tout; int poll_tout;
time_t tout; time_t tout;
int nfds, events; int nfds, events, pout;
sock *s; sock *s;
node *n; node *n;
int fdmax = 256; int fdmax = 256;
@ -2125,16 +2125,16 @@ io_loop(void)
/* And finally enter poll() to find active sockets */ /* And finally enter poll() to find active sockets */
watchdog_stop(); watchdog_stop();
events = poll(pfd, nfds, poll_tout); pout = poll(pfd, nfds, poll_tout);
watchdog_start(); watchdog_start();
if (events < 0) if (pout < 0)
{ {
if (errno == EINTR || errno == EAGAIN) if (errno == EINTR || errno == EAGAIN)
continue; continue;
die("poll: %m"); die("poll: %m");
} }
if (events) if (pout)
{ {
/* guaranteed to be non-empty */ /* guaranteed to be non-empty */
current_sock = SKIP_BACK(sock, n, HEAD(sock_list)); current_sock = SKIP_BACK(sock, n, HEAD(sock_list));