mirror of
https://gitlab.nic.cz/labs/bird.git
synced 2024-11-08 12:18:42 +00:00
Merge commit 'v2.13.1-168-g5e9cf0ab' into thread-next
This commit is contained in:
commit
a28264adc5
@ -47,6 +47,7 @@ void ev_enqueue(event_list *, event *);
|
||||
void ev_postpone(event *);
|
||||
int ev_run_list_limited(event_list *, uint);
|
||||
#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))
|
||||
|
||||
|
@ -2335,13 +2335,17 @@ io_loop(void)
|
||||
for(;;)
|
||||
{
|
||||
times_update();
|
||||
events = ev_run_list(&global_event_list);
|
||||
events = ev_run_list_limited(&global_work_list, WORK_EVENTS_MAX) || events;
|
||||
events = ev_run_list(&main_birdloop.event_list) || events;
|
||||
ev_run_list(&global_event_list);
|
||||
ev_run_list_limited(&global_work_list, WORK_EVENTS_MAX);
|
||||
ev_run_list(&main_birdloop.event_list);
|
||||
timers_fire(&main_birdloop.time, 1);
|
||||
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 */
|
||||
if (t = timers_first(&main_birdloop.time))
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user