proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-07-27 13:06:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #930 from qlyoung/fix-masters-list-reachable

Browse Source 
lib: fix still reachable linked list in thread.c
This commit is contained in:
Lou Berger 2017-08-08 13:58:06 -04:00 committed by GitHub
commit 11f3bfdd71
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/thread.c
View File

@ -340,9 +340,6 @@ static void cancelreq_del(void *cr)
/* initializer, only ever called once */ /* initializer, only ever called once */
static void initializer() static void initializer()
{ {
if (!masters)
masters = list_new();
pthread_key_create(&thread_current, NULL); pthread_key_create(&thread_current, NULL);
} }
@ -415,9 +412,12 @@ struct thread_master *thread_master_create(const char *name)
rv->handler.copy = XCALLOC(MTYPE_THREAD_MASTER, rv->handler.copy = XCALLOC(MTYPE_THREAD_MASTER,
sizeof(struct pollfd) * rv->handler.pfdsize); sizeof(struct pollfd) * rv->handler.pfdsize);
/* add to list */ /* add to list of threadmasters */
pthread_mutex_lock(&masters_mtx); pthread_mutex_lock(&masters_mtx);
{ {
if (!masters)
masters = list_new();
listnode_add(masters, rv); listnode_add(masters, rv);
} }
pthread_mutex_unlock(&masters_mtx); pthread_mutex_unlock(&masters_mtx);
@ -551,6 +551,10 @@ void thread_master_free(struct thread_master *m)
pthread_mutex_lock(&masters_mtx); pthread_mutex_lock(&masters_mtx);
{ {
listnode_delete(masters, m); listnode_delete(masters, m);
if (masters->count == 0) {
list_free (masters);
masters = NULL;
}
} }
pthread_mutex_unlock(&masters_mtx); pthread_mutex_unlock(&masters_mtx);