*: Convert THREAD_XXX macros to EVENT_XXX macros

[mirror_frr.git] / pimd / pim_upstream.c

diff --git a/pimd/pim_upstream.c b/pimd/pim_upstream.c
index b08c363269a0733fee9f6c8fb59e2e33045b09d4..283fdfc1951285b719cc5960d15684cdc32cb50c 100644 (file)
--- a/pimd/pim_upstream.c
+++ b/pimd/pim_upstream.c
@@ -166,10 +166,10 @@ static void upstream_channel_oil_detach(struct pim_upstream *up)
 
 static void pim_upstream_timers_stop(struct pim_upstream *up)
 {
-       THREAD_OFF(up->t_ka_timer);
-       THREAD_OFF(up->t_rs_timer);
-       THREAD_OFF(up->t_msdp_reg_timer);
-       THREAD_OFF(up->t_join_timer);
+       EVENT_OFF(up->t_ka_timer);
+       EVENT_OFF(up->t_rs_timer);
+       EVENT_OFF(up->t_msdp_reg_timer);
+       EVENT_OFF(up->t_join_timer);
 }
 
 struct pim_upstream *pim_upstream_del(struct pim_instance *pim,
@@ -293,7 +293,7 @@ static void on_join_timer(struct event *t)
 {
        struct pim_upstream *up;
 
-       up = THREAD_ARG(t);
+       up = EVENT_ARG(t);
 
        if (!up->rpf.source_nexthop.interface) {
                if (PIM_DEBUG_PIM_TRACE)
@@ -323,7 +323,7 @@ static void join_timer_stop(struct pim_upstream *up)
 {
        struct pim_neighbor *nbr = NULL;
 
-       THREAD_OFF(up->t_join_timer);
+       EVENT_OFF(up->t_join_timer);
 
        if (up->rpf.source_nexthop.interface)
                nbr = pim_neighbor_find(up->rpf.source_nexthop.interface,
@@ -353,7 +353,7 @@ void join_timer_start(struct pim_upstream *up)
        if (nbr)
                pim_jp_agg_add_group(nbr->upstream_jp_agg, up, 1, nbr);
        else {
-               THREAD_OFF(up->t_join_timer);
+               EVENT_OFF(up->t_join_timer);
                event_add_timer(router->master, on_join_timer, up,
                                router->t_periodic, &up->t_join_timer);
        }
@@ -370,7 +370,7 @@ void join_timer_start(struct pim_upstream *up)
 void pim_upstream_join_timer_restart(struct pim_upstream *up,
                                     struct pim_rpf *old)
 {
-       // THREAD_OFF(up->t_join_timer);
+       // EVENT_OFF(up->t_join_timer);
        join_timer_start(up);
 }
 
@@ -382,7 +382,7 @@ static void pim_upstream_join_timer_restart_msec(struct pim_upstream *up,
                           __func__, interval_msec, up->sg_str);
        }
 
-       THREAD_OFF(up->t_join_timer);
+       EVENT_OFF(up->t_join_timer);
        event_add_timer_msec(router->master, on_join_timer, up, interval_msec,
                             &up->t_join_timer);
 }
@@ -1361,7 +1361,7 @@ static void pim_upstream_fhr_kat_expiry(struct pim_instance *pim,
                           up->sg_str);
 
        /* stop reg-stop timer */
-       THREAD_OFF(up->t_rs_timer);
+       EVENT_OFF(up->t_rs_timer);
        /* remove regiface from the OIL if it is there*/
        pim_channel_del_oif(up->channel_oil, pim->regiface,
                            PIM_OIF_FLAG_PROTO_PIM, __func__);
@@ -1465,7 +1465,7 @@ static void pim_upstream_keep_alive_timer(struct event *t)
 {
        struct pim_upstream *up;
 
-       up = THREAD_ARG(t);
+       up = EVENT_ARG(t);
 
        /* pull the stats and re-check */
        if (pim_upstream_sg_running_proc(up))
@@ -1482,7 +1482,7 @@ void pim_upstream_keep_alive_timer_start(struct pim_upstream *up, uint32_t time)
                        zlog_debug("kat start on %s with no stream reference",
                                   up->sg_str);
        }
-       THREAD_OFF(up->t_ka_timer);
+       EVENT_OFF(up->t_ka_timer);
        event_add_timer(router->master, pim_upstream_keep_alive_timer, up, time,
                        &up->t_ka_timer);
 
@@ -1496,7 +1496,7 @@ void pim_upstream_keep_alive_timer_start(struct pim_upstream *up, uint32_t time)
 /* MSDP on RP needs to know if a source is registerable to this RP */
 static void pim_upstream_msdp_reg_timer(struct event *t)
 {
-       struct pim_upstream *up = THREAD_ARG(t);
+       struct pim_upstream *up = EVENT_ARG(t);
        struct pim_instance *pim = up->channel_oil->pim;
 
        /* source is no longer active - pull the SA from MSDP's cache */
@@ -1505,7 +1505,7 @@ static void pim_upstream_msdp_reg_timer(struct event *t)
 
 void pim_upstream_msdp_reg_timer_start(struct pim_upstream *up)
 {
-       THREAD_OFF(up->t_msdp_reg_timer);
+       EVENT_OFF(up->t_msdp_reg_timer);
        event_add_timer(router->master, pim_upstream_msdp_reg_timer, up,
                        PIM_MSDP_REG_RXED_PERIOD, &up->t_msdp_reg_timer);
 
@@ -1685,7 +1685,7 @@ static void pim_upstream_register_stop_timer(struct event *t)
        struct pim_interface *pim_ifp;
        struct pim_instance *pim;
        struct pim_upstream *up;
-       up = THREAD_ARG(t);
+       up = EVENT_ARG(t);
        pim = up->channel_oil->pim;
 
        if (PIM_DEBUG_PIM_TRACE) {
@@ -1749,7 +1749,7 @@ void pim_upstream_start_register_stop_timer(struct pim_upstream *up,
 {
        uint32_t time;
 
-       THREAD_OFF(up->t_rs_timer);
+       EVENT_OFF(up->t_rs_timer);
 
        if (!null_register) {
                uint32_t lower = (0.5 * router->register_suppress_time);