1
0
mirror of https://gitlab.labs.nic.cz/labs/bird.git synced 2024-05-11 16:54:54 +00:00

Timers: Integrate microsecond timers to the main loop

This commit is contained in:
Ondrej Zajicek (work)
2017-05-31 15:46:04 +02:00
parent 534215a18f
commit 28a7d3943e
2 changed files with 20 additions and 3 deletions

View File

@@ -2507,9 +2507,10 @@ static int short_loops = 0;
void
io_loop(void)
{
int poll_tout;
int poll_tout, timeout;
time_t tout;
int nfds, events, pout;
timer2 *t;
sock *s;
node *n;
int fdmax = 256;
@@ -2518,7 +2519,9 @@ io_loop(void)
watchdog_start1();
for(;;)
{
times_update(&main_timeloop);
events = ev_run_list(&global_event_list);
timers_fire(&main_timeloop);
timers:
update_times();
tout = tm_first_shot();
@@ -2527,10 +2530,16 @@ io_loop(void)
tm_shot();
goto timers;
}
poll_tout = (events ? 0 : MIN(tout - now, 3)) * 1000; /* Time in milliseconds */
io_close_event();
poll_tout = (events ? 0 : MIN(tout - now, 3)) * 1000; /* Time in milliseconds */
if (t = timers_first(&main_timeloop))
{
times_update(&main_timeloop);
timeout = (tm2_remains(t) TO_MS) + 1;
poll_tout = MIN(poll_tout, timeout);
}
nfds = 0;
WALK_LIST(n, sock_list)
{
@@ -2601,6 +2610,8 @@ io_loop(void)
}
if (pout)
{
times_update(&main_timeloop);
/* guaranteed to be non-empty */
current_sock = SKIP_BACK(sock, n, HEAD(sock_list));