mirror of
https://gitlab.nic.cz/labs/bird.git
synced 2024-12-23 02:01:55 +00:00
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
606e779dd6
commit
95c40c335e
@ -2040,7 +2040,7 @@ io_loop(void)
|
||||
{
|
||||
int poll_tout;
|
||||
time_t tout;
|
||||
int nfds, events;
|
||||
int nfds, events, pout;
|
||||
sock *s;
|
||||
node *n;
|
||||
int fdmax = 256;
|
||||
@ -2120,16 +2120,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 New Issue
Block a user