diff options
| author | Donald Sharp <sharpd@nvidia.com> | 2022-12-11 14:19:00 +0100 |
|---|---|---|
| committer | Donald Sharp <sharpd@nvidia.com> | 2023-03-24 13:32:17 +0100 |
| commit | 4f830a0799e74bd18af18e3ded5d6e16c79a7d56 (patch) | |
| tree | e92b4fe1c6e633c1667f718f6e9a87d22d8518e3 /isisd | |
| parent | *: Convert thread_execute to event_execute (diff) | |
| download | frr-4f830a0799e74bd18af18e3ded5d6e16c79a7d56.tar.xz frr-4f830a0799e74bd18af18e3ded5d6e16c79a7d56.zip | |
*: Convert thread_timer_remain_XXX to event_timer_remain_XXX
Signed-off-by: Donald Sharp <sharpd@nvidia.com>
Diffstat (limited to 'isisd')
| -rw-r--r-- | isisd/isis_ldp_sync.c | 4 | ||||
| -rw-r--r-- | isisd/isis_lsp.c | 4 | ||||
| -rw-r--r-- | isisd/isis_pdu.c | 2 | ||||
| -rw-r--r-- | isisd/isisd.c | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/isisd/isis_ldp_sync.c b/isisd/isis_ldp_sync.c index 65ca7ac3c..6c9292ffc 100644 --- a/isisd/isis_ldp_sync.c +++ b/isisd/isis_ldp_sync.c @@ -575,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, diff --git a/isisd/isis_lsp.c b/isisd/isis_lsp.c index 62912addc..114a499dd 100644 --- a/isisd/isis_lsp.c +++ b/isisd/isis_lsp.c @@ -1603,7 +1603,7 @@ int _lsp_regenerate_schedule(struct isis_area *area, int level, * Note: in case of a BFD 'down' message the refresh is * scheduled once again just to be sure */ - struct timeval remain = thread_timer_remain( + struct timeval remain = event_timer_remain( area->t_lsp_refresh[lvl - 1]); sched_debug( "ISIS (%s): Regeneration is already pending, nothing todo. (Due in %lld.%03lld seconds)", @@ -1986,7 +1986,7 @@ int lsp_regenerate_schedule_pseudo(struct isis_circuit *circuit, int level) } if (circuit->lsp_regenerate_pending[lvl - 1]) { - struct timeval remain = thread_timer_remain( + struct timeval remain = event_timer_remain( circuit->u.bc.t_refresh_pseudo_lsp[lvl - 1]); sched_debug( "ISIS (%s): Regenerate is already pending, nothing todo. (Due in %lld.%03lld seconds)", diff --git a/isisd/isis_pdu.c b/isisd/isis_pdu.c index 3e8cb3f72..00ee7f8eb 100644 --- a/isisd/isis_pdu.c +++ b/isisd/isis_pdu.c @@ -2053,7 +2053,7 @@ static void _send_hello_sched(struct isis_circuit *circuit, struct event **threadp, int level, long delay) { if (*threadp) { - if (thread_timer_remain_msec(*threadp) < (unsigned long)delay) + if (event_timer_remain_msec(*threadp) < (unsigned long)delay) return; THREAD_OFF(*threadp); diff --git a/isisd/isisd.c b/isisd/isisd.c index 86dbc228f..14641f67c 100644 --- a/isisd/isisd.c +++ b/isisd/isisd.c @@ -2250,7 +2250,7 @@ static void isis_spf_ietf_common(struct vty *vty, struct isis *isis) vty_out(vty, " Level-%d:\n", level); vty_out(vty, " SPF delay status: "); if (area->spf_timer[level - 1]) { - struct timeval remain = thread_timer_remain( + struct timeval remain = event_timer_remain( area->spf_timer[level - 1]); vty_out(vty, "Pending, due in %lld msec\n", (long long)remain.tv_sec * 1000 |