mirrors/bird
mirrors/bird
0
0
Fork 0
mirror of https://gitlab.nic.cz/labs/bird.git synced 2024-11-10 13:18:42 +00:00
Code Releases Activity

IO loop duration fixup

Browse Source
This commit is contained in:
Maria Matejka 2022-02-01 14:53:38 +01:00
parent aca4c3fc8e
commit c019008383
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/timer.h
View File

@ -55,6 +55,7 @@ static inline timer *timers_first(struct timeloop *loop)
#define current_time() atomic_load_explicit(&last_time, memory_order_acquire) #define current_time() atomic_load_explicit(&last_time, memory_order_acquire)
#define current_real_time() atomic_load_explicit(&real_time, memory_order_acquire) #define current_real_time() atomic_load_explicit(&real_time, memory_order_acquire)
#define current_time_update() ({ times_update(); current_time(); })
//#define now (current_time() TO_S) //#define now (current_time() TO_S)
//#define now_real (current_real_time() TO_S) //#define now_real (current_real_time() TO_S)

4
sysdep/unix/io-loop.c
View File

@ -558,7 +558,7 @@ birdloop_main(void *arg)
if (loop->poll_changed) if (loop->poll_changed)
sockets_prepare(loop); sockets_prepare(loop);
btime duration = current_time() - loop_begin; btime duration = current_time_update() - loop_begin;
if (duration > config->watchdog_warning) if (duration > config->watchdog_warning)
log(L_WARN "I/O loop cycle took %d ms", (int) (duration TO_MS)); log(L_WARN "I/O loop cycle took %d ms", (int) (duration TO_MS));
@ -578,7 +578,7 @@ birdloop_main(void *arg)
if (loop->stopped && !loop->links) if (loop->stopped && !loop->links)
break; break;
loop_begin = current_time(); loop_begin = current_time_update();
if (rv) if (rv)
sockets_fire(loop); sockets_fire(loop);

3
sysdep/unix/io.c
View File

@ -2100,8 +2100,7 @@ static btime loop_time;
static void static void
io_update_time(void) io_update_time(void)
{ {
times_update(); last_io_time = current_time_update();
last_io_time = current_time();
if (event_open) if (event_open)
{ {