diff options
Diffstat (limited to 'isisd/isis_ldp_sync.c')
| -rw-r--r-- | isisd/isis_ldp_sync.c | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/isisd/isis_ldp_sync.c b/isisd/isis_ldp_sync.c index 817e2a2015..53676ffe36 100644 --- a/isisd/isis_ldp_sync.c +++ b/isisd/isis_ldp_sync.c @@ -9,7 +9,7 @@ #include "monotime.h" #include "memory.h" -#include "thread.h" +#include "frrevent.h" #include "prefix.h" #include "table.h" #include "vty.h" @@ -171,7 +171,7 @@ void isis_ldp_sync_if_complete(struct isis_circuit *circuit) if (ldp_sync_info->state == LDP_IGP_SYNC_STATE_REQUIRED_NOT_UP) ldp_sync_info->state = LDP_IGP_SYNC_STATE_REQUIRED_UP; - THREAD_OFF(ldp_sync_info->t_holddown); + EVENT_OFF(ldp_sync_info->t_holddown); isis_ldp_sync_set_if_metric(circuit, true); } @@ -191,7 +191,7 @@ void isis_ldp_sync_ldp_fail(struct isis_circuit *circuit) if (ldp_sync_info && ldp_sync_info->enabled == LDP_IGP_SYNC_ENABLED && ldp_sync_info->state != LDP_IGP_SYNC_STATE_NOT_REQUIRED) { - THREAD_OFF(ldp_sync_info->t_holddown); + EVENT_OFF(ldp_sync_info->t_holddown); ldp_sync_info->state = LDP_IGP_SYNC_STATE_REQUIRED_NOT_UP; isis_ldp_sync_set_if_metric(circuit, true); } @@ -331,7 +331,7 @@ void isis_ldp_sync_set_if_metric(struct isis_circuit *circuit, bool run_regen) /* * LDP-SYNC holddown timer routines */ -static void isis_ldp_sync_holddown_timer(struct thread *thread) +static void isis_ldp_sync_holddown_timer(struct event *thread) { struct isis_circuit *circuit; struct ldp_sync_info *ldp_sync_info; @@ -340,7 +340,7 @@ static void isis_ldp_sync_holddown_timer(struct thread *thread) * didn't receive msg from LDP indicating sync-complete * restore interface cost to original value */ - circuit = THREAD_ARG(thread); + circuit = EVENT_ARG(thread); if (circuit->ldp_sync_info == NULL) return; @@ -373,9 +373,8 @@ void isis_ldp_sync_holddown_timer_add(struct isis_circuit *circuit) ils_debug("%s: start holddown timer for %s time %d", __func__, circuit->interface->name, ldp_sync_info->holddown); - thread_add_timer(master, isis_ldp_sync_holddown_timer, - circuit, ldp_sync_info->holddown, - &ldp_sync_info->t_holddown); + event_add_timer(master, isis_ldp_sync_holddown_timer, circuit, + ldp_sync_info->holddown, &ldp_sync_info->t_holddown); } /* @@ -517,7 +516,7 @@ void isis_if_ldp_sync_disable(struct isis_circuit *circuit) if (!CHECK_FLAG(area->ldp_sync_cmd.flags, LDP_SYNC_FLAG_ENABLE)) return; - THREAD_OFF(ldp_sync_info->t_holddown); + EVENT_OFF(ldp_sync_info->t_holddown); ldp_sync_info->state = LDP_IGP_SYNC_STATE_NOT_REQUIRED; isis_ldp_sync_set_if_metric(circuit, true); } @@ -576,8 +575,8 @@ static void isis_circuit_ldp_sync_print_vty(struct isis_circuit *circuit, break; case LDP_IGP_SYNC_STATE_REQUIRED_NOT_UP: if (ldp_sync_info->t_holddown != NULL) { - struct timeval remain = thread_timer_remain( - ldp_sync_info->t_holddown); + struct timeval remain = + event_timer_remain(ldp_sync_info->t_holddown); vty_out(vty, " Holddown timer is running %lld.%03lld remaining\n", (long long)remain.tv_sec, |