mirrors/bird
mirrors/bird
0
0
Fork 0
mirror of https://gitlab.nic.cz/labs/bird.git synced 2025-01-05 08:31:53 +00:00
Code Releases Activity

Merge commit 'v2.13.1-168-g5e9cf0ab' into thread-next

Browse Source
This commit is contained in:
Maria Matejka 2024-01-28 13:40:23 +01:00
commit a28264adc5
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/event.h
View File

@ -47,6 +47,7 @@ void ev_enqueue(event_list *, event *);
void ev_postpone(event *); void ev_postpone(event *);
int ev_run_list_limited(event_list *, uint); int ev_run_list_limited(event_list *, uint);
#define ev_run_list(l) ev_run_list_limited((l), ~0) #define ev_run_list(l) ev_run_list_limited((l), ~0)
#define ev_list_empty(l) !ev_run_list_limited((l), 0)
#define LEGACY_EVENT_LIST(l) (((l) == &global_event_list) || ((l) == &global_work_list)) #define LEGACY_EVENT_LIST(l) (((l) == &global_event_list) || ((l) == &global_work_list))

12
sysdep/unix/io.c
View File

@ -2335,13 +2335,17 @@ io_loop(void)
for(;;) for(;;)
{ {
times_update(); times_update();
events = ev_run_list(&global_event_list); ev_run_list(&global_event_list);
events = ev_run_list_limited(&global_work_list, WORK_EVENTS_MAX) || events; ev_run_list_limited(&global_work_list, WORK_EVENTS_MAX);
events = ev_run_list(&main_birdloop.event_list) || events; ev_run_list(&main_birdloop.event_list);
timers_fire(&main_birdloop.time, 1); timers_fire(&main_birdloop.time, 1);
io_close_event(); io_close_event();
// FIXME events =
!ev_list_empty(&global_event_list) ||
!ev_list_empty(&global_work_list) ||
!ev_list_empty(&main_birdloop.event_list);
poll_tout = (events ? 0 : 3000); /* Time in milliseconds */ poll_tout = (events ? 0 : 3000); /* Time in milliseconds */
if (t = timers_first(&main_birdloop.time)) if (t = timers_first(&main_birdloop.time))
{ {