proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-07 22:29:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

lib: delete pthread from tracking list on delete

Browse Source 
Pthreads were not being deleted from the list after destruction. This
isn't causing any bugs currently but that's just by dumb luck.

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
This commit is contained in:
Quentin Young 2019-08-09 18:01:06 +00:00
parent 8e0bab8a1e
commit 54baf432f0
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/frr_pthread.c
View File

@ -51,12 +51,13 @@ void frr_pthread_init(void)
{ {
frr_with_mutex(&frr_pthread_list_mtx) { frr_with_mutex(&frr_pthread_list_mtx) {
frr_pthread_list = list_new(); frr_pthread_list = list_new();
frr_pthread_list->del = (void (*)(void *))&frr_pthread_destroy;
} }
} }
void frr_pthread_finish(void) void frr_pthread_finish(void)
{ {
frr_pthread_stop_all();
frr_with_mutex(&frr_pthread_list_mtx) { frr_with_mutex(&frr_pthread_list_mtx) {
list_delete(&frr_pthread_list); list_delete(&frr_pthread_list);
} }
@ -99,8 +100,11 @@ struct frr_pthread *frr_pthread_new(struct frr_pthread_attr *attr,
void frr_pthread_destroy(struct frr_pthread *fpt) void frr_pthread_destroy(struct frr_pthread *fpt)
{ {
thread_master_free(fpt->master); frr_with_mutex(&frr_pthread_list_mtx) {
listnode_delete(frr_pthread_list, fpt);
}
thread_master_free(fpt->master);
pthread_mutex_destroy(&fpt->mtx); pthread_mutex_destroy(&fpt->mtx);
pthread_mutex_destroy(fpt->running_cond_mtx); pthread_mutex_destroy(fpt->running_cond_mtx);
pthread_cond_destroy(fpt->running_cond); pthread_cond_destroy(fpt->running_cond);
@ -183,10 +187,13 @@ void frr_pthread_stop_all(void)
frr_with_mutex(&frr_pthread_list_mtx) { frr_with_mutex(&frr_pthread_list_mtx) {
struct listnode *n; struct listnode *n;
struct frr_pthread *fpt; struct frr_pthread *fpt;
for (ALL_LIST_ELEMENTS_RO(frr_pthread_list, n, fpt)) for (ALL_LIST_ELEMENTS_RO(frr_pthread_list, n, fpt)) {
if (atomic_load_explicit(&fpt->running,
memory_order_relaxed))
frr_pthread_stop(fpt, NULL); frr_pthread_stop(fpt, NULL);
} }
} }
}
/* /*
* ---------------------------------------------------------------------------- * ----------------------------------------------------------------------------