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

Explicitly counting loops and threads

Browse Source
This commit is contained in:
Maria Matejka 2023-04-27 10:42:11 +02:00
parent 9c22310612
commit 8bc27583ff
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -588,6 +588,8 @@ struct birdloop_pickup_group {
DOMAIN(resource) domain; DOMAIN(resource) domain;
list loops; list loops;
list threads; list threads;
uint thread_count;
uint loop_count;
btime max_latency; btime max_latency;
event start_threads; event start_threads;
} pickup_groups[2] = { } pickup_groups[2] = {
@ -878,6 +880,8 @@ bird_thread_start(struct birdloop_pickup_group *group)
if (e = pthread_create(&thr->thread_id, &thr->thread_attr, bird_thread_main, thr)) if (e = pthread_create(&thr->thread_id, &thr->thread_attr, bird_thread_main, thr))
die("pthread_create() failed: %M", e); die("pthread_create() failed: %M", e);
group->thread_count++;
UNLOCK_DOMAIN(resource, group->domain); UNLOCK_DOMAIN(resource, group->domain);
birdloop_leave(meta); birdloop_leave(meta);
return thr; return thr;
@ -899,7 +903,7 @@ 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(resource, group->domain);
int dif = list_length(&group->threads) - thread_dropper_goal; int dif = group->thread_count - thread_dropper_goal;
struct birdloop *tdl_stop = NULL; struct birdloop *tdl_stop = NULL;
if (dif > 0) if (dif > 0)
@ -925,6 +929,7 @@ bird_thread_shutdown(void * _ UNUSED)
/* Leave the thread-picker list to get no more loops */ /* Leave the thread-picker list to get no more loops */
LOCK_DOMAIN(resource, group->domain); LOCK_DOMAIN(resource, group->domain);
rem_node(&thr->n); rem_node(&thr->n);
group->thread_count--;
UNLOCK_DOMAIN(resource, group->domain); UNLOCK_DOMAIN(resource, group->domain);
/* Drop loops including the thread dropper itself */ /* Drop loops including the thread dropper itself */
@ -932,6 +937,7 @@ bird_thread_shutdown(void * _ UNUSED)
birdloop_drop(HEAD(thr->loops), group); birdloop_drop(HEAD(thr->loops), group);
/* Let others know about new loops */ /* Let others know about new loops */
LOCK_DOMAIN(resource, 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(resource, group->domain);
@ -974,7 +980,7 @@ bird_thread_commit(struct config *new, struct config *old UNUSED)
struct birdloop_pickup_group *group = &pickup_groups[0]; struct birdloop_pickup_group *group = &pickup_groups[0];
LOCK_DOMAIN(resource, group->domain); LOCK_DOMAIN(resource, group->domain);
int dif = list_length(&group->threads) - (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(resource, group->domain);
@ -1242,9 +1248,15 @@ birdloop_stop_internal(struct birdloop *loop)
tm_stop(&loop->timer); tm_stop(&loop->timer);
/* Remove from thread loop list */ /* Remove from thread loop list */
ASSERT_DIE(loop->thread == this_thread);
rem_node(&loop->n); rem_node(&loop->n);
loop->thread = NULL; loop->thread = NULL;
/* Uncount from thread group */
LOCK_DOMAIN(resource, this_thread->group->domain);
this_thread->group->loop_count--;
UNLOCK_DOMAIN(resource, 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));
loop->ping_pending = 0; loop->ping_pending = 0;
@ -1353,6 +1365,7 @@ birdloop_vnew_internal(pool *pp, uint order, struct birdloop_pickup_group *group
if (group) if (group)
{ {
LOCK_DOMAIN(resource, group->domain); LOCK_DOMAIN(resource, group->domain);
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);