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

IO: allow for faster loop dropping

Browse Source
This commit is contained in:
Maria Matejka 2024-06-25 17:48:25 +02:00
parent a4a7e09478
commit 2a6fe617b1
1 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -667,8 +667,9 @@ bird_thread_pickup_next(struct birdloop_pickup_group *group)
static _Bool static _Bool
birdloop_hot_potato(struct birdloop *loop) birdloop_hot_potato(struct birdloop *loop)
{ {
if (!loop) return 0; if (!loop)
if (!NODE_VALID(&loop->n)) return 0; return 0;
return ns_now() - loop->last_transition_ns < 1 S TO_NS; return ns_now() - loop->last_transition_ns < 1 S TO_NS;
} }
@ -677,45 +678,56 @@ birdloop_take(struct birdloop_pickup_group *group)
{ {
struct birdloop *loop = NULL; struct birdloop *loop = NULL;
if (birdloop_hot_potato(this_thread->meta))
return;
LOCK_DOMAIN(attrs, group->domain); LOCK_DOMAIN(attrs, group->domain);
if (this_thread->busy_active && if (this_thread->busy_active &&
(group->thread_busy_count < group->thread_count) && (group->thread_busy_count < group->thread_count) &&
(this_thread->loop_count > 1) && (this_thread->loop_count > 1) &&
!EMPTY_LIST(group->loops) &&
birdloop_hot_potato(HEAD(group->loops))) birdloop_hot_potato(HEAD(group->loops)))
{ {
THREAD_TRACE(DL_SCHEDULING, "Loop drop requested (tbc=%d, tc=%d, lc=%d)", THREAD_TRACE(DL_SCHEDULING, "Loop drop requested (tbc=%d, tc=%d, lc=%d)",
group->thread_busy_count, group->thread_count, this_thread->loop_count); group->thread_busy_count, group->thread_count, this_thread->loop_count);
UNLOCK_DOMAIN(attrs, group->domain); UNLOCK_DOMAIN(attrs, group->domain);
int dropped = 0; uint dropped = 0;
node *n; node *n;
WALK_LIST2(loop, n, this_thread->loops, n) WALK_LIST2(loop, n, this_thread->loops, n)
{ {
birdloop_enter(loop); birdloop_enter(loop);
if (ev_active(&loop->event) && !loop->stopped && !birdloop_hot_potato(loop)) if (ev_active(&loop->event) && !loop->stopped && !birdloop_hot_potato(loop))
{ {
LOOP_TRACE(loop, DL_SCHEDULING, "Dropping from thread");
/* Pass to another thread */ /* Pass to another thread */
rem_node(&loop->n); rem_node(&loop->n);
this_thread->loop_count--; this_thread->loop_count--;
LOOP_TRACE(loop, DL_SCHEDULING, "Dropping from thread, remaining %u loops here", this_thread->loop_count);
/* This also unschedules the loop from Meta */ /* This also unschedules the loop from Meta */
birdloop_set_thread(loop, NULL, group); birdloop_set_thread(loop, NULL, group);
dropped++;
if (dropped * dropped > this_thread->loop_count)
{
birdloop_leave(loop); birdloop_leave(loop);
LOCK_DOMAIN(attrs, group->domain); LOCK_DOMAIN(attrs, group->domain);
bird_thread_pickup_next(group); bird_thread_pickup_next(group);
UNLOCK_DOMAIN(attrs, group->domain); UNLOCK_DOMAIN(attrs, group->domain);
dropped = 1;
break; break;
} }
}
birdloop_leave(loop); birdloop_leave(loop);
} }
if (dropped) if (dropped)
{
this_thread->meta->last_transition_ns = ns_now();
return; return;
}
this_thread->busy_counter = 0; this_thread->busy_counter = 0;
bird_thread_busy_set(this_thread, 0); bird_thread_busy_set(this_thread, 0);
@ -756,6 +768,7 @@ birdloop_take(struct birdloop_pickup_group *group)
} }
UNLOCK_DOMAIN(attrs, group->domain); UNLOCK_DOMAIN(attrs, group->domain);
this_thread->meta->last_transition_ns = ns_now();
} }
static int static int
@ -820,12 +833,12 @@ bird_thread_main(void *arg)
u64 thr_loop_start = ns_now(); u64 thr_loop_start = ns_now();
int timeout; int timeout;
/* Pickup new loops */
birdloop_take(thr->group);
/* Schedule all loops with timed out timers */ /* Schedule all loops with timed out timers */
timers_fire(&thr->meta->time, 0); timers_fire(&thr->meta->time, 0);
/* Pickup new loops */
birdloop_take(thr->group);
/* Compute maximal time per loop */ /* Compute maximal time per loop */
u64 thr_before_run = ns_now(); u64 thr_before_run = ns_now();
if (thr->loop_count > 0) if (thr->loop_count > 0)