proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-14 16:04:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bgpd: move startup sync lock around

Browse Source 
Condition needs to be set inside critical section, otherwise i/o thread
can deadlock. Also unlock mutex once finished with it, no need to hold
the lock for the life of the program.

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
This commit is contained in:
Quentin Young 2018-01-10 11:20:09 -05:00
parent f09a656d24
commit f42ebe8a67
No known key found for this signature in database
GPG Key ID: DAF48E0F57E0834F
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bgpd/bgp_io.c
View File

@ -78,6 +78,7 @@ void bgp_io_init()
pthread_mutex_init(running_cond_mtx, NULL);
pthread_cond_init(running_cond, NULL);
/* unlocked in bgp_io_wait_running() */
pthread_mutex_lock(running_cond_mtx);
}
@ -96,9 +97,9 @@ void *bgp_io_start(void *arg)
struct thread task;
bgp_io_thread_run = true;
pthread_mutex_lock(running_cond_mtx);
{
bgp_io_thread_run = true;
pthread_cond_signal(running_cond);
}
pthread_mutex_unlock(running_cond_mtx);
@ -119,6 +120,9 @@ void bgp_io_wait_running()
{
while (!bgp_io_thread_run)
pthread_cond_wait(running_cond, running_cond_mtx);
/* locked in bgp_io_init() */
pthread_mutex_unlock(running_cond_mtx);
}
int bgp_io_stop(void **result, struct frr_pthread *fpt)
@ -126,7 +130,6 @@ int bgp_io_stop(void **result, struct frr_pthread *fpt)
thread_add_event(fpt->master, &bgp_io_finish, NULL, 0, NULL);
pthread_join(fpt->thread, result);
pthread_mutex_unlock(running_cond_mtx);
pthread_mutex_destroy(running_cond_mtx);
pthread_cond_destroy(running_cond);