From 907a2395f423e3b97335d554557c2cef7195db84 Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Fri, 20 May 2022 14:19:08 -0400 Subject: *: Convert thread_add_XXX functions to event_add_XXX Signed-off-by: Donald Sharp --- eigrpd/eigrp_filter.c | 8 ++++---- eigrpd/eigrp_hello.c | 14 +++++++------- eigrpd/eigrp_interface.c | 2 +- eigrpd/eigrp_macros.h | 2 +- eigrpd/eigrp_neighbor.c | 8 ++++---- eigrpd/eigrp_packet.c | 36 ++++++++++++++++++------------------ eigrpd/eigrp_update.c | 4 ++-- eigrpd/eigrpd.c | 2 +- 8 files changed, 38 insertions(+), 38 deletions(-) (limited to 'eigrpd') diff --git a/eigrpd/eigrp_filter.c b/eigrpd/eigrp_filter.c index a4d59db6b7..f39530877a 100644 --- a/eigrpd/eigrp_filter.c +++ b/eigrpd/eigrp_filter.c @@ -114,8 +114,8 @@ void eigrp_distribute_update(struct distribute_ctx *ctx, thread_cancel(&(e->t_distribute)); /* schedule Graceful restart for whole process in 10sec */ - thread_add_timer(master, eigrp_distribute_timer_process, e, - (10), &e->t_distribute); + event_add_timer(master, eigrp_distribute_timer_process, e, (10), + &e->t_distribute); return; } @@ -188,8 +188,8 @@ void eigrp_distribute_update(struct distribute_ctx *ctx, /* Cancel GR scheduled */ thread_cancel(&(ei->t_distribute)); /* schedule Graceful restart for interface in 10sec */ - thread_add_timer(master, eigrp_distribute_timer_interface, ei, 10, - &ei->t_distribute); + event_add_timer(master, eigrp_distribute_timer_interface, ei, 10, + &ei->t_distribute); } /* diff --git a/eigrpd/eigrp_hello.c b/eigrpd/eigrp_hello.c index c6d3b879d9..02807dd31d 100644 --- a/eigrpd/eigrp_hello.c +++ b/eigrpd/eigrp_hello.c @@ -80,8 +80,8 @@ void eigrp_hello_timer(struct event *thread) eigrp_hello_send(ei, EIGRP_HELLO_NORMAL, NULL); /* Hello timer set. */ - thread_add_timer(master, eigrp_hello_timer, ei, ei->params.v_hello, - &ei->t_hello); + event_add_timer(master, eigrp_hello_timer, ei, ei->params.v_hello, + &ei->t_hello); } /** @@ -726,8 +726,8 @@ void eigrp_hello_send_ack(struct eigrp_neighbor *nbr) listnode_add(nbr->ei->eigrp->oi_write_q, nbr->ei); nbr->ei->on_write_q = 1; } - thread_add_write(master, eigrp_write, nbr->ei->eigrp, - nbr->ei->eigrp->fd, &nbr->ei->eigrp->t_write); + event_add_write(master, eigrp_write, nbr->ei->eigrp, + nbr->ei->eigrp->fd, &nbr->ei->eigrp->t_write); } } @@ -774,9 +774,9 @@ void eigrp_hello_send(struct eigrp_interface *ei, uint8_t flags, thread_execute(master, eigrp_write, ei->eigrp, ei->eigrp->fd); } else { - thread_add_write(master, eigrp_write, ei->eigrp, - ei->eigrp->fd, - &ei->eigrp->t_write); + event_add_write(master, eigrp_write, ei->eigrp, + ei->eigrp->fd, + &ei->eigrp->t_write); } } } diff --git a/eigrpd/eigrp_interface.c b/eigrpd/eigrp_interface.c index eeb2bd4d09..cd268fa9b9 100644 --- a/eigrpd/eigrp_interface.c +++ b/eigrpd/eigrp_interface.c @@ -251,7 +251,7 @@ int eigrp_if_up(struct eigrp_interface *ei) /* Set multicast memberships appropriately for new state. */ eigrp_if_set_multicast(ei); - thread_add_event(master, eigrp_hello_timer, ei, (1), &ei->t_hello); + event_add_event(master, eigrp_hello_timer, ei, (1), &ei->t_hello); /*Prepare metrics*/ metric.bandwidth = eigrp_bandwidth_to_scaled(ei->params.bandwidth); diff --git a/eigrpd/eigrp_macros.h b/eigrpd/eigrp_macros.h index b7cd22fee1..75f1d7e133 100644 --- a/eigrpd/eigrp_macros.h +++ b/eigrpd/eigrp_macros.h @@ -27,6 +27,6 @@ /* FSM macros*/ #define EIGRP_FSM_EVENT_SCHEDULE(I, E) \ - thread_add_event(master, eigrp_fsm_event, (I), (E)) + event_add_event(master, eigrp_fsm_event, (I), (E)) #endif /* _ZEBRA_EIGRP_MACROS_H_ */ diff --git a/eigrpd/eigrp_neighbor.c b/eigrpd/eigrp_neighbor.c index 582428ed1f..e40c4a50bd 100644 --- a/eigrpd/eigrp_neighbor.c +++ b/eigrpd/eigrp_neighbor.c @@ -261,15 +261,15 @@ void eigrp_nbr_state_update(struct eigrp_neighbor *nbr) case EIGRP_NEIGHBOR_PENDING: { /*Reset Hold Down Timer for neighbor*/ THREAD_OFF(nbr->t_holddown); - thread_add_timer(master, holddown_timer_expired, nbr, - nbr->v_holddown, &nbr->t_holddown); + event_add_timer(master, holddown_timer_expired, nbr, + nbr->v_holddown, &nbr->t_holddown); break; } case EIGRP_NEIGHBOR_UP: { /*Reset Hold Down Timer for neighbor*/ THREAD_OFF(nbr->t_holddown); - thread_add_timer(master, holddown_timer_expired, nbr, - nbr->v_holddown, &nbr->t_holddown); + event_add_timer(master, holddown_timer_expired, nbr, + nbr->v_holddown, &nbr->t_holddown); break; } } diff --git a/eigrpd/eigrp_packet.c b/eigrpd/eigrp_packet.c index 24603fa743..51b68fb34b 100644 --- a/eigrpd/eigrp_packet.c +++ b/eigrpd/eigrp_packet.c @@ -453,8 +453,8 @@ out: /* If packets still remain in queue, call write thread. */ if (!list_isempty(eigrp->oi_write_q)) { - thread_add_write(master, eigrp_write, eigrp, eigrp->fd, - &eigrp->t_write); + event_add_write(master, eigrp_write, eigrp, eigrp->fd, + &eigrp->t_write); } } @@ -477,7 +477,7 @@ void eigrp_read(struct event *thread) eigrp = THREAD_ARG(thread); /* prepare for next packet. */ - thread_add_read(master, eigrp_read, eigrp, eigrp->fd, &eigrp->t_read); + event_add_read(master, eigrp_read, eigrp, eigrp->fd, &eigrp->t_read); stream_reset(eigrp->ibuf); if (!(ibuf = eigrp_recv_packet(eigrp, eigrp->fd, &ifp, eigrp->ibuf))) { @@ -828,9 +828,9 @@ void eigrp_send_packet_reliably(struct eigrp_neighbor *nbr) eigrp_fifo_push(nbr->ei->obuf, duplicate); /*Start retransmission timer*/ - thread_add_timer(master, eigrp_unack_packet_retrans, nbr, - EIGRP_PACKET_RETRANS_TIME, - &ep->t_retrans_timer); + event_add_timer(master, eigrp_unack_packet_retrans, nbr, + EIGRP_PACKET_RETRANS_TIME, + &ep->t_retrans_timer); /*Increment sequence number counter*/ nbr->ei->eigrp->sequence_number++; @@ -840,8 +840,8 @@ void eigrp_send_packet_reliably(struct eigrp_neighbor *nbr) listnode_add(nbr->ei->eigrp->oi_write_q, nbr->ei); nbr->ei->on_write_q = 1; } - thread_add_write(master, eigrp_write, nbr->ei->eigrp, - nbr->ei->eigrp->fd, &nbr->ei->eigrp->t_write); + event_add_write(master, eigrp_write, nbr->ei->eigrp, + nbr->ei->eigrp->fd, &nbr->ei->eigrp->t_write); } } @@ -992,17 +992,17 @@ void eigrp_unack_packet_retrans(struct event *thread) } /*Start retransmission timer*/ - thread_add_timer(master, eigrp_unack_packet_retrans, nbr, - EIGRP_PACKET_RETRANS_TIME, - &ep->t_retrans_timer); + event_add_timer(master, eigrp_unack_packet_retrans, nbr, + EIGRP_PACKET_RETRANS_TIME, + &ep->t_retrans_timer); /* Hook thread to write packet. */ if (nbr->ei->on_write_q == 0) { listnode_add(nbr->ei->eigrp->oi_write_q, nbr->ei); nbr->ei->on_write_q = 1; } - thread_add_write(master, eigrp_write, nbr->ei->eigrp, - nbr->ei->eigrp->fd, &nbr->ei->eigrp->t_write); + event_add_write(master, eigrp_write, nbr->ei->eigrp, + nbr->ei->eigrp->fd, &nbr->ei->eigrp->t_write); } } @@ -1027,17 +1027,17 @@ void eigrp_unack_multicast_packet_retrans(struct event *thread) } /*Start retransmission timer*/ - thread_add_timer(master, eigrp_unack_multicast_packet_retrans, - nbr, EIGRP_PACKET_RETRANS_TIME, - &ep->t_retrans_timer); + event_add_timer(master, eigrp_unack_multicast_packet_retrans, + nbr, EIGRP_PACKET_RETRANS_TIME, + &ep->t_retrans_timer); /* Hook thread to write packet. */ if (nbr->ei->on_write_q == 0) { listnode_add(nbr->ei->eigrp->oi_write_q, nbr->ei); nbr->ei->on_write_q = 1; } - thread_add_write(master, eigrp_write, nbr->ei->eigrp, - nbr->ei->eigrp->fd, &nbr->ei->eigrp->t_write); + event_add_write(master, eigrp_write, nbr->ei->eigrp, + nbr->ei->eigrp->fd, &nbr->ei->eigrp->t_write); } } diff --git a/eigrpd/eigrp_update.c b/eigrpd/eigrp_update.c index ccc0c9a4b2..5fa4695317 100644 --- a/eigrpd/eigrp_update.c +++ b/eigrpd/eigrp_update.c @@ -906,8 +906,8 @@ void eigrp_update_send_GR_thread(struct event *thread) /* if there is packet waiting in queue, * schedule this thread again with small delay */ if (nbr->retrans_queue->count > 0) { - thread_add_timer_msec(master, eigrp_update_send_GR_thread, nbr, - 10, &nbr->t_nbr_send_gr); + event_add_timer_msec(master, eigrp_update_send_GR_thread, nbr, + 10, &nbr->t_nbr_send_gr); return; } diff --git a/eigrpd/eigrpd.c b/eigrpd/eigrpd.c index 9db0531b59..f94bcea736 100644 --- a/eigrpd/eigrpd.c +++ b/eigrpd/eigrpd.c @@ -157,7 +157,7 @@ static struct eigrp *eigrp_new(uint16_t as, vrf_id_t vrf_id) eigrp->ibuf = stream_new(EIGRP_PACKET_MAX_LEN + 1); - thread_add_read(master, eigrp_read, eigrp, eigrp->fd, &eigrp->t_read); + event_add_read(master, eigrp_read, eigrp, eigrp->fd, &eigrp->t_read); eigrp->oi_write_q = list_new(); eigrp->topology_table = route_table_init(); -- cgit v1.2.3