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

IO Loop / Thread Groups Lock moved to level -attrs- to allow for page allocation while locked

Browse Source
This commit is contained in:
Maria Matejka 2023-05-05 20:35:55 +02:00
parent 62432affd9
commit cb51ff1fbb
1 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -581,11 +581,11 @@ sockets_fire(struct birdloop *loop)
* Threads * Threads
*/ */
DEFINE_DOMAIN(resource); DEFINE_DOMAIN(attrs);
static void bird_thread_start_event(void *_data); static void bird_thread_start_event(void *_data);
struct birdloop_pickup_group { struct birdloop_pickup_group {
DOMAIN(resource) domain; DOMAIN(attrs) domain;
list loops; list loops;
list threads; list threads;
uint thread_count; uint thread_count;
@ -652,9 +652,9 @@ birdloop_set_thread(struct birdloop *loop, struct bird_thread *thr, struct birdl
else else
{ {
/* Put into pickup list */ /* Put into pickup list */
LOCK_DOMAIN(resource, group->domain); LOCK_DOMAIN(attrs, group->domain);
add_tail(&group->loops, &loop->n); add_tail(&group->loops, &loop->n);
UNLOCK_DOMAIN(resource, group->domain); UNLOCK_DOMAIN(attrs, group->domain);
} }
} }
@ -662,14 +662,14 @@ static void
bird_thread_pickup_next(struct birdloop_pickup_group *group) bird_thread_pickup_next(struct birdloop_pickup_group *group)
{ {
/* This thread goes to the end of the pickup list */ /* This thread goes to the end of the pickup list */
LOCK_DOMAIN(resource, group->domain); LOCK_DOMAIN(attrs, group->domain);
rem_node(&this_thread->n); rem_node(&this_thread->n);
add_tail(&group->threads, &this_thread->n); add_tail(&group->threads, &this_thread->n);
/* If there are more loops to be picked up, wakeup the next thread in order */ /* If there are more loops to be picked up, wakeup the next thread in order */
if (!EMPTY_LIST(group->loops)) if (!EMPTY_LIST(group->loops))
wakeup_do_kick(SKIP_BACK(struct bird_thread, n, HEAD(group->threads))); wakeup_do_kick(SKIP_BACK(struct bird_thread, n, HEAD(group->threads)));
UNLOCK_DOMAIN(resource, group->domain); UNLOCK_DOMAIN(attrs, group->domain);
} }
static struct birdloop * static struct birdloop *
@ -677,7 +677,7 @@ birdloop_take(struct birdloop_pickup_group *group)
{ {
struct birdloop *loop = NULL; struct birdloop *loop = NULL;
LOCK_DOMAIN(resource, group->domain); LOCK_DOMAIN(attrs, group->domain);
int drop = int drop =
this_thread->busy_active && this_thread->busy_active &&
@ -687,7 +687,7 @@ birdloop_take(struct birdloop_pickup_group *group)
if (drop) if (drop)
{ {
UNLOCK_DOMAIN(resource, group->domain); UNLOCK_DOMAIN(attrs, group->domain);
node *n; node *n;
WALK_LIST2(loop, n, this_thread->loops, n) WALK_LIST2(loop, n, this_thread->loops, n)
@ -717,7 +717,7 @@ birdloop_take(struct birdloop_pickup_group *group)
/* Take the first loop from the pickup list and unlock */ /* Take the first loop from the pickup list and unlock */
loop = SKIP_BACK(struct birdloop, n, HEAD(group->loops)); loop = SKIP_BACK(struct birdloop, n, HEAD(group->loops));
rem_node(&loop->n); rem_node(&loop->n);
UNLOCK_DOMAIN(resource, group->domain); UNLOCK_DOMAIN(attrs, group->domain);
birdloop_set_thread(loop, this_thread, group); birdloop_set_thread(loop, this_thread, group);
bird_thread_pickup_next(group); bird_thread_pickup_next(group);
@ -725,7 +725,7 @@ birdloop_take(struct birdloop_pickup_group *group)
} }
else else
{ {
UNLOCK_DOMAIN(resource, group->domain); UNLOCK_DOMAIN(attrs, group->domain);
return NULL; return NULL;
} }
} }
@ -744,13 +744,13 @@ poll_timeout(struct birdloop *loop)
static void static void
bird_thread_busy_set(struct bird_thread *thr, int val) bird_thread_busy_set(struct bird_thread *thr, int val)
{ {
LOCK_DOMAIN(resource, thr->group->domain); LOCK_DOMAIN(attrs, thr->group->domain);
if (thr->busy_active = val) if (thr->busy_active = val)
thr->group->thread_busy_count++; thr->group->thread_busy_count++;
else else
thr->group->thread_busy_count--; thr->group->thread_busy_count--;
ASSERT_DIE(thr->group->thread_busy_count <= thr->group->thread_count); ASSERT_DIE(thr->group->thread_busy_count <= thr->group->thread_count);
UNLOCK_DOMAIN(resource, thr->group->domain); UNLOCK_DOMAIN(attrs, thr->group->domain);
} }
static void static void
@ -921,7 +921,7 @@ bird_thread_start(struct birdloop_pickup_group *group)
pool *p = birdloop_pool(meta); pool *p = birdloop_pool(meta);
birdloop_enter(meta); birdloop_enter(meta);
LOCK_DOMAIN(resource, group->domain); LOCK_DOMAIN(attrs, group->domain);
struct bird_thread *thr = mb_allocz(p, sizeof(*thr)); struct bird_thread *thr = mb_allocz(p, sizeof(*thr));
thr->pool = p; thr->pool = p;
@ -954,7 +954,7 @@ bird_thread_start(struct birdloop_pickup_group *group)
group->thread_count++; group->thread_count++;
UNLOCK_DOMAIN(resource, group->domain); UNLOCK_DOMAIN(attrs, group->domain);
birdloop_leave(meta); birdloop_leave(meta);
return thr; return thr;
} }
@ -981,7 +981,7 @@ static void
bird_thread_shutdown(void * _ UNUSED) bird_thread_shutdown(void * _ UNUSED)
{ {
struct birdloop_pickup_group *group = this_thread->group; struct birdloop_pickup_group *group = this_thread->group;
LOCK_DOMAIN(resource, group->domain); LOCK_DOMAIN(attrs, group->domain);
int dif = group->thread_count - thread_dropper_goal; int dif = group->thread_count - thread_dropper_goal;
struct birdloop *tdl_stop = NULL; struct birdloop *tdl_stop = NULL;
@ -993,7 +993,7 @@ bird_thread_shutdown(void * _ UNUSED)
thread_dropper = NULL; thread_dropper = NULL;
} }
UNLOCK_DOMAIN(resource, group->domain); UNLOCK_DOMAIN(attrs, group->domain);
DBG("Thread pickup size differs from dropper goal by %d%s\n", dif, tdl_stop ? ", stopping" : ""); DBG("Thread pickup size differs from dropper goal by %d%s\n", dif, tdl_stop ? ", stopping" : "");
@ -1005,7 +1005,7 @@ bird_thread_shutdown(void * _ UNUSED)
struct bird_thread *thr = this_thread; struct bird_thread *thr = this_thread;
LOCK_DOMAIN(resource, group->domain); LOCK_DOMAIN(attrs, group->domain);
/* Leave the thread-picker list to get no more loops */ /* Leave the thread-picker list to get no more loops */
rem_node(&thr->n); rem_node(&thr->n);
group->thread_count--; group->thread_count--;
@ -1014,7 +1014,7 @@ bird_thread_shutdown(void * _ UNUSED)
if (thr->busy_active) if (thr->busy_active)
group->thread_busy_count--; group->thread_busy_count--;
UNLOCK_DOMAIN(resource, group->domain); UNLOCK_DOMAIN(attrs, group->domain);
/* Leave the thread-dropper loop as we aren't going to return. */ /* Leave the thread-dropper loop as we aren't going to return. */
birdloop_leave(thread_dropper); birdloop_leave(thread_dropper);
@ -1033,10 +1033,10 @@ bird_thread_shutdown(void * _ UNUSED)
} }
/* Let others know about new loops */ /* Let others know about new loops */
LOCK_DOMAIN(resource, group->domain); LOCK_DOMAIN(attrs, group->domain);
if (!EMPTY_LIST(group->loops)) if (!EMPTY_LIST(group->loops))
wakeup_do_kick(SKIP_BACK(struct bird_thread, n, HEAD(group->threads))); wakeup_do_kick(SKIP_BACK(struct bird_thread, n, HEAD(group->threads)));
UNLOCK_DOMAIN(resource, group->domain); UNLOCK_DOMAIN(attrs, group->domain);
/* Stop the meta loop */ /* Stop the meta loop */
birdloop_leave(thr->meta); birdloop_leave(thr->meta);
@ -1068,12 +1068,12 @@ bird_thread_commit(struct config *new, struct config *old UNUSED)
while (1) while (1)
{ {
struct birdloop_pickup_group *group = &pickup_groups[0]; struct birdloop_pickup_group *group = &pickup_groups[0];
LOCK_DOMAIN(resource, group->domain); LOCK_DOMAIN(attrs, group->domain);
int dif = group->thread_count - (thread_dropper_goal = new->thread_count); int dif = group->thread_count - (thread_dropper_goal = new->thread_count);
_Bool thread_dropper_running = !!thread_dropper; _Bool thread_dropper_running = !!thread_dropper;
UNLOCK_DOMAIN(resource, group->domain); UNLOCK_DOMAIN(attrs, group->domain);
if (dif < 0) if (dif < 0)
{ {
@ -1087,10 +1087,10 @@ bird_thread_commit(struct config *new, struct config *old UNUSED)
birdloop_enter(tdl); birdloop_enter(tdl);
event *tde = ev_new_init(tdl->pool, bird_thread_shutdown, NULL); event *tde = ev_new_init(tdl->pool, bird_thread_shutdown, NULL);
LOCK_DOMAIN(resource, group->domain); LOCK_DOMAIN(attrs, group->domain);
thread_dropper = tdl; thread_dropper = tdl;
thread_dropper_event = tde; thread_dropper_event = tde;
UNLOCK_DOMAIN(resource, group->domain); UNLOCK_DOMAIN(attrs, group->domain);
ev_send_loop(thread_dropper, thread_dropper_event); ev_send_loop(thread_dropper, thread_dropper_event);
birdloop_leave(tdl); birdloop_leave(tdl);
@ -1211,7 +1211,7 @@ bird_thread_show_finish(void *data)
{ {
struct birdloop_pickup_group *group = &pickup_groups[i]; struct birdloop_pickup_group *group = &pickup_groups[i];
LOCK_DOMAIN(resource, group->domain); LOCK_DOMAIN(attrs, group->domain);
uint count = 0; uint count = 0;
u64 total_time_ns = 0; u64 total_time_ns = 0;
if (!EMPTY_LIST(group->loops)) if (!EMPTY_LIST(group->loops))
@ -1237,7 +1237,7 @@ bird_thread_show_finish(void *data)
else else
tsd_append("All loops in group %d are assigned.", i); tsd_append("All loops in group %d are assigned.", i);
UNLOCK_DOMAIN(resource, group->domain); UNLOCK_DOMAIN(attrs, group->domain);
} }
for (uint i = 0; i < tsd->line_pos - 1; i++) for (uint i = 0; i < tsd->line_pos - 1; i++)
@ -1262,10 +1262,10 @@ cmd_show_threads(int show_loops)
for (int i=0; i<2; i++) for (int i=0; i<2; i++)
{ {
struct birdloop_pickup_group *group = &pickup_groups[i]; struct birdloop_pickup_group *group = &pickup_groups[i];
LOCK_DOMAIN(resource, group->domain); LOCK_DOMAIN(attrs, group->domain);
total_threads += group->thread_count; total_threads += group->thread_count;
total_loops += group->loop_count; total_loops += group->loop_count;
UNLOCK_DOMAIN(resource, group->domain); UNLOCK_DOMAIN(attrs, group->domain);
} }
/* Total number of lines must be recalculated when changing the code! */ /* Total number of lines must be recalculated when changing the code! */
@ -1291,7 +1291,7 @@ cmd_show_threads(int show_loops)
{ {
struct birdloop_pickup_group *group = &pickup_groups[i]; struct birdloop_pickup_group *group = &pickup_groups[i];
LOCK_DOMAIN(resource, group->domain); LOCK_DOMAIN(attrs, group->domain);
struct bird_thread *thr; struct bird_thread *thr;
WALK_LIST(thr, group->threads) WALK_LIST(thr, group->threads)
@ -1301,7 +1301,7 @@ cmd_show_threads(int show_loops)
wakeup_do_kick(thr); wakeup_do_kick(thr);
} }
UNLOCK_DOMAIN(resource, group->domain); UNLOCK_DOMAIN(attrs, group->domain);
} }
UNLOCK_DOMAIN(control, lock); UNLOCK_DOMAIN(control, lock);
@ -1325,8 +1325,8 @@ birdloop_init(void)
{ {
struct birdloop_pickup_group *group = &pickup_groups[i]; struct birdloop_pickup_group *group = &pickup_groups[i];
group->domain = DOMAIN_NEW(resource); group->domain = DOMAIN_NEW(attrs);
DOMAIN_SETUP(resource, group->domain, "Loop Pickup", NULL); DOMAIN_SETUP(attrs, group->domain, "Loop Pickup", NULL);
init_list(&group->loops); init_list(&group->loops);
init_list(&group->threads); init_list(&group->threads);
} }
@ -1377,9 +1377,9 @@ birdloop_stop_internal(struct birdloop *loop)
loop->thread = NULL; loop->thread = NULL;
/* Uncount from thread group */ /* Uncount from thread group */
LOCK_DOMAIN(resource, this_thread->group->domain); LOCK_DOMAIN(attrs, this_thread->group->domain);
this_thread->group->loop_count--; this_thread->group->loop_count--;
UNLOCK_DOMAIN(resource, this_thread->group->domain); UNLOCK_DOMAIN(attrs, this_thread->group->domain);
/* Leave the loop context without causing any other fuss */ /* Leave the loop context without causing any other fuss */
ASSERT_DIE(!ev_active(&loop->event)); ASSERT_DIE(!ev_active(&loop->event));
@ -1488,13 +1488,13 @@ birdloop_vnew_internal(pool *pp, uint order, struct birdloop_pickup_group *group
if (group) if (group)
{ {
LOCK_DOMAIN(resource, group->domain); LOCK_DOMAIN(attrs, group->domain);
group->loop_count++; group->loop_count++;
add_tail(&group->loops, &loop->n); add_tail(&group->loops, &loop->n);
if (EMPTY_LIST(group->threads)) if (EMPTY_LIST(group->threads))
ev_send(&global_event_list, &group->start_threads); ev_send(&global_event_list, &group->start_threads);
wakeup_do_kick(SKIP_BACK(struct bird_thread, n, HEAD(group->threads))); wakeup_do_kick(SKIP_BACK(struct bird_thread, n, HEAD(group->threads)));
UNLOCK_DOMAIN(resource, group->domain); UNLOCK_DOMAIN(attrs, group->domain);
} }
else else
loop->n.next = loop->n.prev = &loop->n; loop->n.next = loop->n.prev = &loop->n;