bgpd: bye bye THREAD_BACKGROUND

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

diff --git a/bgpd/bgp_fsm.c b/bgpd/bgp_fsm.c
index 961ee20abbb4aef9cc46d6cdb31071b710b14dee..d18c5cedc5da47d75e4c2b156f04a7c90767e3fb 100644 (file)
--- a/bgpd/bgp_fsm.c
+++ b/bgpd/bgp_fsm.c
@@ -457,7 +457,7 @@ int bgp_routeadv_timer(struct thread *thread)
 
        peer->synctime = bgp_clock();
 
-       thread_add_background(bm->master, bgp_generate_updgrp_packets, peer, 0,
+       thread_add_timer_msec(bm->master, bgp_generate_updgrp_packets, peer, 0,
                              &peer->t_generate_updgrp_packets);
 
        /* MRAI timer will be started again when FIFO is built, no need to
@@ -665,7 +665,7 @@ void bgp_adjust_routeadv(struct peer *peer)
                        BGP_TIMER_OFF(peer->t_routeadv);
 
                peer->synctime = bgp_clock();
-               thread_add_background(bm->master, bgp_generate_updgrp_packets,
+               thread_add_timer_msec(bm->master, bgp_generate_updgrp_packets,
                                      peer, 0,
                                      &peer->t_generate_updgrp_packets);
                return;

diff --git a/bgpd/bgp_io.c b/bgpd/bgp_io.c
index 27c23f4470d8b4b6cb566a964eeb73fd440f7a16..63559467e6e13fa2be34e30cbbea2bc7446e9c8a 100644 (file)
--- a/bgpd/bgp_io.c
+++ b/bgpd/bgp_io.c
@@ -150,7 +150,7 @@ void bgp_reads_on(struct peer *peer)
        {
                thread_add_read(fpt->master, bgp_process_reads, peer, peer->fd,
                                &peer->t_read);
-               thread_add_background(bm->master, bgp_process_packet, peer, 0,
+               thread_add_timer_msec(bm->master, bgp_process_packet, peer, 0,
                                      &peer->t_process_packet);
                SET_FLAG(peer->thread_flags, PEER_THREAD_READS_ON);
        }
@@ -205,7 +205,7 @@ static int bgp_process_writes(struct thread *thread)
        if (reschedule) {
                thread_add_write(fpt->master, bgp_process_writes, peer,
                                 peer->fd, &peer->t_write);
-               thread_add_background(bm->master, bgp_generate_updgrp_packets,
+               thread_add_timer_msec(bm->master, bgp_generate_updgrp_packets,
                                      peer, 0,
                                      &peer->t_generate_updgrp_packets);
        }
@@ -334,9 +334,6 @@ static int bgp_process_reads(struct thread *thread)
                if (added_pkt)
                        thread_add_event(bm->master, bgp_process_packet, peer,
                                         0, NULL);
-               //                        thread_add_background(bm->master,
-               //                        bgp_process_packet, peer,
-               //                                         0, NULL);
        }
 
        return 0;