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

Main IO loop shouldn't skip sockets when ping is received

Browse Source
This commit is contained in:
Maria Matejka 2021-12-02 11:41:53 +00:00 committed by Maria Matejka
parent c5b6b18413
commit 2117864a87
1 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
sysdep/unix/io.c
View File

@ -2200,6 +2200,7 @@ io_loop(void)
{ {
int poll_tout, timeout; int poll_tout, timeout;
int nfds, events, pout; int nfds, events, pout;
int reload_requested = 0;
timer *t; timer *t;
sock *s; sock *s;
node *n; node *n;
@ -2216,8 +2217,9 @@ io_loop(void)
timers_fire(&main_birdloop.time, 1); timers_fire(&main_birdloop.time, 1);
io_close_event(); io_close_event();
restart_poll:
// FIXME // FIXME
poll_tout = (events ? 0 : 3000); /* Time in milliseconds */ poll_tout = ((reload_requested || events) ? 0 : 3000); /* Time in milliseconds */
if (t = timers_first(&main_birdloop.time)) if (t = timers_first(&main_birdloop.time))
{ {
times_update(); times_update();
@ -2300,16 +2302,23 @@ io_loop(void)
continue; continue;
die("poll: %m"); die("poll: %m");
} }
if (pout)
{ if (pout && (pfd[0].revents & POLLIN))
if (pfd[0].revents & POLLIN)
{ {
/* IO loop reload requested */ /* IO loop reload requested */
pipe_drain(main_birdloop.wakeup_fds[0]); pipe_drain(main_birdloop.wakeup_fds[0]);
atomic_exchange_explicit(&main_birdloop.ping_sent, 0, memory_order_acq_rel); reload_requested = 1;
continue; goto restart_poll;
} }
if (reload_requested)
{
reload_requested = 0;
atomic_exchange_explicit(&main_birdloop.ping_sent, 0, memory_order_acq_rel);
}
if (pout)
{
times_update(); times_update();
/* guaranteed to be non-empty */ /* guaranteed to be non-empty */