summaryrefslogtreecommitdiff
path: root/lib/libfrr.c
diff options
context:
space:
mode:
authorQuentin Young <qlyoung@cumulusnetworks.com>2019-08-09 18:03:01 +0000
committerQuentin Young <qlyoung@cumulusnetworks.com>2019-09-16 16:12:04 +0000
commitb9b4c0610afd182c82d3a42afe66dc538910f6c8 (patch)
treef57563b80ecd94052e9cca223ec93d842207b8a7 /lib/libfrr.c
parent54baf432f064f30e22b2c5873a54ac6f407131ce (diff)
lib: handle frr_pthread_init/fini in libfrr init
Make sure we are always cleaning init'ing and cleaning up pthread infra. Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
Diffstat (limited to 'lib/libfrr.c')
-rw-r--r--lib/libfrr.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/libfrr.c b/lib/libfrr.c
index 4301dc20ad..478fe4e205 100644
--- a/lib/libfrr.c
+++ b/lib/libfrr.c
@@ -42,6 +42,7 @@
#include "northbound_db.h"
#include "debug.h"
#include "frrcu.h"
+#include "frr_pthread.h"
DEFINE_HOOK(frr_late_init, (struct thread_master * tm), (tm))
DEFINE_KOOH(frr_early_fini, (), ())
@@ -681,6 +682,8 @@ struct thread_master *frr_init(void)
memory_init();
log_filter_cmd_init();
+ frr_pthread_init();
+
log_ref_init();
log_ref_vty_init();
lib_error_init();
@@ -1076,6 +1079,7 @@ void frr_fini(void)
db_close();
#endif
log_ref_fini();
+ frr_pthread_finish();
zprivs_terminate(di->privs);
/* signal_init -> nothing needed */
thread_master_free(master);