lib, bgpd: implement pthread lifecycle management

Removes the WiP shim and implements proper thread lifecycle management.

* Declare necessary pthread_t's in bgp_master
* Define new MTYPE in lib/thread.c for pthreads
* Allocate and free BGP's pthreads appropriately
* Terminate and join threads appropriately

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>

diff --git a/bgpd/bgp_main.c b/bgpd/bgp_main.c
index d8cd7d51731b202c5d7004ba106a37ffead6cbcd..066733989aea4113609546ba9e9c356b9a02b273 100644 (file)
--- a/bgpd/bgp_main.c
+++ b/bgpd/bgp_main.c
@@ -194,6 +194,9 @@ static __attribute__((__noreturn__)) void bgp_exit(int status)
        /* reverse bgp_attr_init */
        bgp_attr_finish();
 
+       /* stop pthreads */
+       bgp_pthreads_finish();
+
        /* reverse access_list_init */
        access_list_add_hook(NULL);
        access_list_delete_hook(NULL);
@@ -395,11 +398,9 @@ int main(int argc, char **argv)
        snprintf(bgpd_di.startinfo, sizeof(bgpd_di.startinfo), ", bgp@%s:%d",
                 (bm->address ? bm->address : "<all>"), bm->port);
 
-       pthread_t packet_writes, keepalives;
-       pthread_create(&packet_writes, NULL, &peer_writes_start, NULL);
-       pthread_create(&keepalives, NULL, &keepalives_start, NULL);
-
        frr_config_fork();
+       /* must be called after fork() */
+       bgp_pthreads_init();
        frr_run(bm->master);
 
        /* Not reached. */

diff --git a/bgpd/bgp_packet.c b/bgpd/bgp_packet.c
index f24492d63ddbce72c2d33a4ce72022aabc50f7f1..6e80c4191404ddaebc38493e4501b66504577d3a 100644 (file)
--- a/bgpd/bgp_packet.c
+++ b/bgpd/bgp_packet.c
@@ -2318,6 +2318,9 @@ void *peer_writes_start(void *arg)
                                bgp_write(peer);
                        }
                        pthread_mutex_unlock(&peer->obuf_mtx);
+
+                       if (!bgp_packet_writes_thread_run)
+                               break;
                }
 
                // schedule update packet generation on main thread

diff --git a/bgpd/bgpd.c b/bgpd/bgpd.c
index cee73e2c43f3e7a5f09b02176f2a2ed92c2727eb..962324712f50b4cfabf9700d8298dec0c3df5a6f 100644 (file)
--- a/bgpd/bgpd.c
+++ b/bgpd/bgpd.c
@@ -75,6 +75,7 @@
 #include "bgpd/bgp_bfd.h"
 #include "bgpd/bgp_memory.h"
 #include "bgpd/bgp_evpn_vty.h"
+#include "bgpd/bgp_keepalives.h"
 
 
 DEFINE_MTYPE_STATIC(BGPD, PEER_TX_SHUTDOWN_MSG, "Peer shutdown message (TX)");
@@ -7326,6 +7327,8 @@ void bgp_master_init(struct thread_master *master)
        bm->start_time = bgp_clock();
        bm->t_rmap_update = NULL;
        bm->rmap_update_timer = RMAP_DEFAULT_UPDATE_TIMER;
+       bm->t_bgp_keepalives = XCALLOC(MTYPE_PTHREAD, sizeof(pthread_t));
+       bm->t_bgp_packet_writes = XCALLOC(MTYPE_PTHREAD, sizeof(pthread_t));
 
        bgp_process_queue_init();
 
@@ -7382,6 +7385,32 @@ static const struct cmd_variable_handler bgp_viewvrf_var_handlers[] = {
        {.completions = NULL},
 };
 
+void bgp_pthreads_init()
+{
+       /* init write & keepalive threads */
+       pthread_create(bm->t_bgp_keepalives, NULL, &peer_keepalives_start,
+                      NULL);
+       pthread_create(bm->t_bgp_packet_writes, NULL, &peer_writes_start, NULL);
+}
+
+void bgp_pthreads_finish()
+{
+       /* set thread cancellation flags */
+       bgp_keepalives_thread_run = false;
+       bgp_packet_writes_thread_run = false;
+
+       /* wake them up */
+       peer_writes_wake();
+       peer_keepalives_wake();
+
+       /* join */
+       pthread_join(*bm->t_bgp_keepalives, NULL);
+       pthread_join(*bm->t_bgp_packet_writes, NULL);
+
+       XFREE(MTYPE_PTHREAD, bm->t_bgp_keepalives);
+       XFREE(MTYPE_PTHREAD, bm->t_bgp_packet_writes);
+}
+
 void bgp_init(void)
 {
 

diff --git a/bgpd/bgpd.h b/bgpd/bgpd.h
index f427c5d9f5d56a04b053350e3d4756bff1a56ba9..2022d47acec9350cca7277496571ae859f07d95c 100644 (file)
--- a/bgpd/bgpd.h
+++ b/bgpd/bgpd.h
@@ -100,6 +100,10 @@ struct bgp_master {
        /* BGP thread master.  */
        struct thread_master *master;
 
+       /* BGP pthreads. */
+       pthread_t *t_bgp_keepalives;
+       pthread_t *t_bgp_packet_writes;
+
        /* work queues */
        struct work_queue *process_main_queue;
 
@@ -1254,6 +1258,8 @@ extern int bgp_config_write(struct vty *);
 extern void bgp_master_init(struct thread_master *master);
 
 extern void bgp_init(void);
+extern void bgp_pthreads_init(void);
+extern void bgp_pthreads_finish(void);
 extern void bgp_route_map_init(void);
 extern void bgp_session_reset(struct peer *);
 

diff --git a/lib/thread.c b/lib/thread.c
index cb5d1d47ae23b48c66c1b5762be80d8aa4bb551c..a805ae34540fd99eb280e5d10f5499e90acaf2c5 100644 (file)
--- a/lib/thread.c
+++ b/lib/thread.c
@@ -36,6 +36,7 @@
 DEFINE_MTYPE_STATIC(LIB, THREAD, "Thread")
 DEFINE_MTYPE_STATIC(LIB, THREAD_MASTER, "Thread master")
 DEFINE_MTYPE_STATIC(LIB, THREAD_STATS, "Thread stats")
+DEFINE_MTYPE(LIB, PTHREAD, "POSIX Thread")
 
 #if defined(__APPLE__)
 #include <mach/mach.h>

diff --git a/lib/thread.h b/lib/thread.h
index c830446e10209f4ead167c06729fae3d757eef41..1cf19d987fc047462d73d0bb7399023406943abb 100644 (file)
--- a/lib/thread.h
+++ b/lib/thread.h
@@ -26,6 +26,9 @@
 #include <poll.h>
 #include "monotime.h"
 
+#include "memory.h"
+DECLARE_MTYPE(PTHREAD)
+
 struct rusage_t {
        struct rusage cpu;
        struct timeval real;