diff options
| author | Donald Sharp <sharpd@nvidia.com> | 2022-12-10 15:08:37 +0100 |
|---|---|---|
| committer | Donald Sharp <sharpd@nvidia.com> | 2023-03-24 13:32:17 +0100 |
| commit | 332beb64b886ee811ae0df05f1f3f21628c100b7 (patch) | |
| tree | 95dfe35b6a90082d4ce572aeb2d46c22ff53564e /eigrpd | |
| parent | *: Convert thread_add_XXX functions to event_add_XXX (diff) | |
| download | frr-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 'eigrpd')
| -rw-r--r-- | eigrpd/eigrp_filter.c | 4 | ||||
| -rw-r--r-- | eigrpd/eigrp_interface.c | 4 | ||||
| -rw-r--r-- | eigrpd/eigrp_neighbor.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/eigrpd/eigrp_filter.c b/eigrpd/eigrp_filter.c index f39530877..cfa4b22af 100644 --- a/eigrpd/eigrp_filter.c +++ b/eigrpd/eigrp_filter.c @@ -111,7 +111,7 @@ void eigrp_distribute_update(struct distribute_ctx *ctx, // TODO: check Graceful restart after 10sec /* cancel GR scheduled */ - thread_cancel(&(e->t_distribute)); + event_cancel(&(e->t_distribute)); /* schedule Graceful restart for whole process in 10sec */ event_add_timer(master, eigrp_distribute_timer_process, e, (10), @@ -186,7 +186,7 @@ void eigrp_distribute_update(struct distribute_ctx *ctx, // TODO: check Graceful restart after 10sec /* Cancel GR scheduled */ - thread_cancel(&(ei->t_distribute)); + event_cancel(&(ei->t_distribute)); /* schedule Graceful restart for interface in 10sec */ event_add_timer(master, eigrp_distribute_timer_interface, ei, 10, &ei->t_distribute); diff --git a/eigrpd/eigrp_interface.c b/eigrpd/eigrp_interface.c index cd268fa9b..297a312a6 100644 --- a/eigrpd/eigrp_interface.c +++ b/eigrpd/eigrp_interface.c @@ -360,7 +360,7 @@ void eigrp_if_stream_unset(struct eigrp_interface *ei) if (ei->on_write_q) { listnode_delete(eigrp->oi_write_q, ei); if (list_isempty(eigrp->oi_write_q)) - thread_cancel(&(eigrp->t_write)); + event_cancel(&(eigrp->t_write)); ei->on_write_q = 0; } } @@ -422,7 +422,7 @@ void eigrp_if_free(struct eigrp_interface *ei, int source) struct eigrp *eigrp = ei->eigrp; if (source == INTERFACE_DOWN_BY_VTY) { - thread_cancel(&ei->t_hello); + event_cancel(&ei->t_hello); eigrp_hello_send(ei, EIGRP_HELLO_GRACEFUL_SHUTDOWN, NULL); } diff --git a/eigrpd/eigrp_neighbor.c b/eigrpd/eigrp_neighbor.c index e40c4a50b..05d1b12f1 100644 --- a/eigrpd/eigrp_neighbor.c +++ b/eigrpd/eigrp_neighbor.c @@ -164,7 +164,7 @@ void eigrp_nbr_delete(struct eigrp_neighbor *nbr) eigrp_topology_neighbor_down(nbr->ei->eigrp, nbr); /* Cancel all events. */ /* Thread lookup cost would be negligible. */ - thread_cancel_event(master, nbr); + event_cancel_event(master, nbr); eigrp_fifo_free(nbr->multicast_queue); eigrp_fifo_free(nbr->retrans_queue); THREAD_OFF(nbr->t_holddown); |