matthieu/frr
1
0
Fork 0
forked from Mirror/frr
Code Pull requests Activity

lib: clean up frr_pthread structs at exit

Browse source 
Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
This commit is contained in:
Quentin Young 2019-09-17 16:12:28 +00:00
parent ef5307f23f
commit 9af949cc95
1 changed files with 21 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
lib/frr_pthread.c
View file

@ -35,6 +35,9 @@ DEFINE_MTYPE_STATIC(LIB, PTHREAD_PRIM, "POSIX sync primitives")
static void *fpt_run(void *arg);
static int fpt_halt(struct frr_pthread *fpt, void **res);
/* misc sigs */
static void frr_pthread_destroy_nolock(struct frr_pthread *fpt);
/* default frr_pthread attributes */
struct frr_pthread_attr frr_pthread_attr_default = {
.start = fpt_run,
@ -59,6 +62,14 @@ void frr_pthread_finish(void)
frr_pthread_stop_all();
frr_with_mutex(&frr_pthread_list_mtx) {
struct listnode *n, *nn;
struct frr_pthread *fpt;
for (ALL_LIST_ELEMENTS(frr_pthread_list, n, nn, fpt)) {
listnode_delete(frr_pthread_list, fpt);
frr_pthread_destroy_nolock(fpt);
}
list_delete(&frr_pthread_list);
}
}
@ -98,12 +109,8 @@ struct frr_pthread *frr_pthread_new(struct frr_pthread_attr *attr,
return fpt;
}
void frr_pthread_destroy(struct frr_pthread *fpt)
static void frr_pthread_destroy_nolock(struct frr_pthread *fpt)
{
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->running_cond_mtx);
@ -114,6 +121,15 @@ void frr_pthread_destroy(struct frr_pthread *fpt)
XFREE(MTYPE_FRR_PTHREAD, fpt);
}
void frr_pthread_destroy(struct frr_pthread *fpt)
{
frr_with_mutex(&frr_pthread_list_mtx) {
listnode_delete(frr_pthread_list, fpt);
}
frr_pthread_destroy_nolock(fpt);
}
int frr_pthread_set_name(struct frr_pthread *fpt)
{
int ret = 0;