summaryrefslogtreecommitdiffstats
path: root/babeld
diff options
context:
space:
mode:
authorDonald Sharp <sharpd@nvidia.com>2022-12-10 15:08:37 +0100
committerDonald Sharp <sharpd@nvidia.com>2023-03-24 13:32:17 +0100
commit332beb64b886ee811ae0df05f1f3f21628c100b7 (patch)
tree95dfe35b6a90082d4ce572aeb2d46c22ff53564e /babeld
parent*: Convert thread_add_XXX functions to event_add_XXX (diff)
downloadfrr-332beb64b886ee811ae0df05f1f3f21628c100b7.tar.xz
frr-332beb64b886ee811ae0df05f1f3f21628c100b7.zip
*: Convert thread_cancelXXX to event_cancelXXX
Modify the code base so that thread_cancel becomes event_cancel Signed-off-by: Donald Sharp <sharpd@nvidia.com>
Diffstat (limited to 'babeld')
-rw-r--r--babeld/babeld.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/babeld/babeld.c b/babeld/babeld.c
index 7bcf8b9a7..4ce92c520 100644
--- a/babeld/babeld.c
+++ b/babeld/babeld.c
@@ -306,8 +306,8 @@ babel_clean_routing_process(void)
babel_interface_close_all();
/* cancel events */
- thread_cancel(&babel_routing_process->t_read);
- thread_cancel(&babel_routing_process->t_update);
+ event_cancel(&babel_routing_process->t_read);
+ event_cancel(&babel_routing_process->t_update);
distribute_list_delete(&babel_routing_process->distribute_ctx);
XFREE(MTYPE_BABEL, babel_routing_process);
@@ -485,7 +485,7 @@ static void
babel_set_timer(struct timeval *timeout)
{
long msecs = timeout->tv_sec * 1000 + timeout->tv_usec / 1000;
- thread_cancel(&(babel_routing_process->t_update));
+ event_cancel(&(babel_routing_process->t_update));
event_add_timer_msec(master, babel_main_loop, NULL, msecs,
&babel_routing_process->t_update);
}