*: Convert thread_add_XXX functions to event_add_XXX

Signed-off-by: Donald Sharp <sharpd@nvidia.com>

6 files changed, 61 insertions, 61 deletions

diff --git a/bfdd/bfd.c b/bfdd/bfd.c
index 0ca2ca1f02..184dfbc8f9 100644
--- a/bfdd/bfd.c
+++ b/bfdd/bfd.c
@@ -1957,23 +1957,23 @@ static int bfd_vrf_enable(struct vrf *vrf)
 		bvrf->bg_echov6 = bp_echov6_socket(vrf);
 
 	if (!bvrf->bg_ev[0] && bvrf->bg_shop != -1)
-		thread_add_read(master, bfd_recv_cb, bvrf, bvrf->bg_shop,
-				&bvrf->bg_ev[0]);
+		event_add_read(master, bfd_recv_cb, bvrf, bvrf->bg_shop,
+			       &bvrf->bg_ev[0]);
 	if (!bvrf->bg_ev[1] && bvrf->bg_mhop != -1)
-		thread_add_read(master, bfd_recv_cb, bvrf, bvrf->bg_mhop,
-				&bvrf->bg_ev[1]);
+		event_add_read(master, bfd_recv_cb, bvrf, bvrf->bg_mhop,
+			       &bvrf->bg_ev[1]);
 	if (!bvrf->bg_ev[2] && bvrf->bg_shop6 != -1)
-		thread_add_read(master, bfd_recv_cb, bvrf, bvrf->bg_shop6,
-				&bvrf->bg_ev[2]);
+		event_add_read(master, bfd_recv_cb, bvrf, bvrf->bg_shop6,
+			       &bvrf->bg_ev[2]);
 	if (!bvrf->bg_ev[3] && bvrf->bg_mhop6 != -1)
-		thread_add_read(master, bfd_recv_cb, bvrf, bvrf->bg_mhop6,
-				&bvrf->bg_ev[3]);
+		event_add_read(master, bfd_recv_cb, bvrf, bvrf->bg_mhop6,
+			       &bvrf->bg_ev[3]);
 	if (!bvrf->bg_ev[4] && bvrf->bg_echo != -1)
-		thread_add_read(master, bfd_recv_cb, bvrf, bvrf->bg_echo,
-				&bvrf->bg_ev[4]);
+		event_add_read(master, bfd_recv_cb, bvrf, bvrf->bg_echo,
+			       &bvrf->bg_ev[4]);
 	if (!bvrf->bg_ev[5] && bvrf->bg_echov6 != -1)
-		thread_add_read(master, bfd_recv_cb, bvrf, bvrf->bg_echov6,
-				&bvrf->bg_ev[5]);
+		event_add_read(master, bfd_recv_cb, bvrf, bvrf->bg_echov6,
+			       &bvrf->bg_ev[5]);
 
 	if (vrf->vrf_id != VRF_DEFAULT) {
 		bfdd_zclient_register(vrf->vrf_id);
diff --git a/bfdd/bfd_packet.c b/bfdd/bfd_packet.c
index 05ed2702d0..2e7bd835fb 100644
--- a/bfdd/bfd_packet.c
+++ b/bfdd/bfd_packet.c
@@ -702,28 +702,28 @@ static void bfd_sd_reschedule(struct bfd_vrf_global *bvrf, int sd)
 {
 	if (sd == bvrf->bg_shop) {
 		THREAD_OFF(bvrf->bg_ev[0]);
-		thread_add_read(master, bfd_recv_cb, bvrf, bvrf->bg_shop,
-				&bvrf->bg_ev[0]);
+		event_add_read(master, bfd_recv_cb, bvrf, bvrf->bg_shop,
+			       &bvrf->bg_ev[0]);
 	} else if (sd == bvrf->bg_mhop) {
 		THREAD_OFF(bvrf->bg_ev[1]);
-		thread_add_read(master, bfd_recv_cb, bvrf, bvrf->bg_mhop,
-				&bvrf->bg_ev[1]);
+		event_add_read(master, bfd_recv_cb, bvrf, bvrf->bg_mhop,
+			       &bvrf->bg_ev[1]);
 	} else if (sd == bvrf->bg_shop6) {
 		THREAD_OFF(bvrf->bg_ev[2]);
-		thread_add_read(master, bfd_recv_cb, bvrf, bvrf->bg_shop6,
-				&bvrf->bg_ev[2]);
+		event_add_read(master, bfd_recv_cb, bvrf, bvrf->bg_shop6,
+			       &bvrf->bg_ev[2]);
 	} else if (sd == bvrf->bg_mhop6) {
 		THREAD_OFF(bvrf->bg_ev[3]);
-		thread_add_read(master, bfd_recv_cb, bvrf, bvrf->bg_mhop6,
-				&bvrf->bg_ev[3]);
+		event_add_read(master, bfd_recv_cb, bvrf, bvrf->bg_mhop6,
+			       &bvrf->bg_ev[3]);
 	} else if (sd == bvrf->bg_echo) {
 		THREAD_OFF(bvrf->bg_ev[4]);
-		thread_add_read(master, bfd_recv_cb, bvrf, bvrf->bg_echo,
-				&bvrf->bg_ev[4]);
+		event_add_read(master, bfd_recv_cb, bvrf, bvrf->bg_echo,
+			       &bvrf->bg_ev[4]);
 	} else if (sd == bvrf->bg_echov6) {
 		THREAD_OFF(bvrf->bg_ev[5]);
-		thread_add_read(master, bfd_recv_cb, bvrf, bvrf->bg_echov6,
-				&bvrf->bg_ev[5]);
+		event_add_read(master, bfd_recv_cb, bvrf, bvrf->bg_echov6,
+			       &bvrf->bg_ev[5]);
 	}
 }
 
diff --git a/bfdd/bfdd.c b/bfdd/bfdd.c
index a3751e4d33..77d66ae104 100644
--- a/bfdd/bfdd.c
+++ b/bfdd/bfdd.c
@@ -375,8 +375,8 @@ int main(int argc, char *argv[])
 	/* Initialize zebra connection. */
 	bfdd_zclient_init(&bglobal.bfdd_privs);
 
-	thread_add_read(master, control_accept, NULL, bglobal.bg_csock,
-			&bglobal.bg_csockev);
+	event_add_read(master, control_accept, NULL, bglobal.bg_csock,
+		       &bglobal.bg_csockev);
 
 	/* Install commands. */
 	bfdd_vty_init();
diff --git a/bfdd/control.c b/bfdd/control.c
index db9778a8eb..95e0ef3d60 100644
--- a/bfdd/control.c
+++ b/bfdd/control.c
@@ -154,7 +154,7 @@ void control_accept(struct event *t)
 
 	control_new(csock);
 
-	thread_add_read(master, control_accept, NULL, sd, &bglobal.bg_csockev);
+	event_add_read(master, control_accept, NULL, sd, &bglobal.bg_csockev);
 }
 
 
@@ -171,7 +171,7 @@ struct bfd_control_socket *control_new(int sd)
 	bcs->bcs_notify = 0;
 
 	bcs->bcs_sd = sd;
-	thread_add_read(master, control_read, bcs, sd, &bcs->bcs_ev);
+	event_add_read(master, control_read, bcs, sd, &bcs->bcs_ev);
 
 	TAILQ_INIT(&bcs->bcs_bcqueue);
 	TAILQ_INIT(&bcs->bcs_bnplist);
@@ -286,8 +286,8 @@ static int control_queue_dequeue(struct bfd_control_socket *bcs)
 	bcs->bcs_bout = &bcq->bcq_bcb;
 
 	bcs->bcs_outev = NULL;
-	thread_add_write(master, control_write, bcs, bcs->bcs_sd,
-			 &bcs->bcs_outev);
+	event_add_write(master, control_write, bcs, bcs->bcs_sd,
+			&bcs->bcs_outev);
 
 	return 1;
 
@@ -315,8 +315,8 @@ static int control_queue_enqueue(struct bfd_control_socket *bcs,
 		bcs->bcs_bout = bcb;
 
 		/* New messages, active write events. */
-		thread_add_write(master, control_write, bcs, bcs->bcs_sd,
-				 &bcs->bcs_outev);
+		event_add_write(master, control_write, bcs, bcs->bcs_sd,
+				&bcs->bcs_outev);
 	}
 
 	return 0;
@@ -511,7 +511,7 @@ skip_header:
 
 schedule_next_read:
 	bcs->bcs_ev = NULL;
-	thread_add_read(master, control_read, bcs, sd, &bcs->bcs_ev);
+	event_add_read(master, control_read, bcs, sd, &bcs->bcs_ev);
 }
 
 static void control_write(struct event *t)
@@ -529,8 +529,8 @@ static void control_write(struct event *t)
 	if (bwrite < 0) {
 		if (errno == EAGAIN || errno == EWOULDBLOCK || errno == EINTR) {
 			bcs->bcs_outev = NULL;
-			thread_add_write(master, control_write, bcs,
-					 bcs->bcs_sd, &bcs->bcs_outev);
+			event_add_write(master, control_write, bcs, bcs->bcs_sd,
+					&bcs->bcs_outev);
 			return;
 		}
 
@@ -543,8 +543,8 @@ static void control_write(struct event *t)
 	bcb->bcb_left -= bwrite;
 	if (bcb->bcb_left > 0) {
 		bcs->bcs_outev = NULL;
-		thread_add_write(master, control_write, bcs, bcs->bcs_sd,
-				 &bcs->bcs_outev);
+		event_add_write(master, control_write, bcs, bcs->bcs_sd,
+				&bcs->bcs_outev);
 		return;
 	}
 
diff --git a/bfdd/dplane.c b/bfdd/dplane.c
index b2c52f543f..7bdebfa1f4 100644
--- a/bfdd/dplane.c
+++ b/bfdd/dplane.c
@@ -429,8 +429,8 @@ static int bfd_dplane_enqueue(struct bfd_dplane_ctx *bdc, const void *buf,
 
 	/* Schedule if it is not yet. */
 	if (bdc->outbufev == NULL)
-		thread_add_write(master, bfd_dplane_write, bdc, bdc->sock,
-				 &bdc->outbufev);
+		event_add_write(master, bfd_dplane_write, bdc, bdc->sock,
+				&bdc->outbufev);
 
 	return 0;
 }
@@ -609,7 +609,7 @@ static void bfd_dplane_read(struct event *t)
 		return;
 
 	stream_pulldown(bdc->inbuf);
-	thread_add_read(master, bfd_dplane_read, bdc, bdc->sock, &bdc->inbufev);
+	event_add_read(master, bfd_dplane_read, bdc, bdc->sock, &bdc->inbufev);
 }
 
 static void _bfd_session_register_dplane(struct hash_bucket *hb, void *arg)
@@ -641,7 +641,7 @@ static struct bfd_dplane_ctx *bfd_dplane_ctx_new(int sock)
 	if (sock == -1)
 		return bdc;
 
-	thread_add_read(master, bfd_dplane_read, bdc, sock, &bdc->inbufev);
+	event_add_read(master, bfd_dplane_read, bdc, sock, &bdc->inbufev);
 
 	/* Register all unattached sessions. */
 	bfd_key_iterate(_bfd_session_register_dplane, bdc);
@@ -682,8 +682,8 @@ static void bfd_dplane_ctx_free(struct bfd_dplane_ctx *bdc)
 		socket_close(&bdc->sock);
 		THREAD_OFF(bdc->inbufev);
 		THREAD_OFF(bdc->outbufev);
-		thread_add_timer(master, bfd_dplane_client_connect, bdc, 3,
-				 &bdc->connectev);
+		event_add_timer(master, bfd_dplane_client_connect, bdc, 3,
+				&bdc->connectev);
 		return;
 	}
 
@@ -840,8 +840,8 @@ static void bfd_dplane_accept(struct event *t)
 		zlog_debug("%s: new data plane client connected", __func__);
 
 reschedule_and_return:
-	thread_add_read(master, bfd_dplane_accept, bg, bg->bg_dplane_sock,
-			&bglobal.bg_dplane_sockev);
+	event_add_read(master, bfd_dplane_accept, bg, bg->bg_dplane_sock,
+		       &bglobal.bg_dplane_sockev);
 }
 
 /*
@@ -856,7 +856,7 @@ static void _bfd_dplane_client_bootstrap(struct bfd_dplane_ctx *bdc)
 	stream_reset(bdc->outbuf);
 
 	/* Ask for read notifications. */
-	thread_add_read(master, bfd_dplane_read, bdc, bdc->sock, &bdc->inbufev);
+	event_add_read(master, bfd_dplane_read, bdc, bdc->sock, &bdc->inbufev);
 
 	/* Remove all sessions then register again to send them all. */
 	bfd_key_iterate(_bfd_session_unregister_dplane, bdc);
@@ -938,8 +938,8 @@ static void bfd_dplane_client_connect(struct event *t)
 
 		/* If we are not connected yet, ask for write notifications. */
 		bdc->connecting = true;
-		thread_add_write(master, bfd_dplane_write, bdc, bdc->sock,
-				 &bdc->outbufev);
+		event_add_write(master, bfd_dplane_write, bdc, bdc->sock,
+				&bdc->outbufev);
 	} else {
 		if (bglobal.debug_dplane)
 			zlog_debug("%s: server connection: %d", __func__, sock);
@@ -952,8 +952,8 @@ reschedule_connect:
 	THREAD_OFF(bdc->inbufev);
 	THREAD_OFF(bdc->outbufev);
 	socket_close(&sock);
-	thread_add_timer(master, bfd_dplane_client_connect, bdc, 3,
-			 &bdc->connectev);
+	event_add_timer(master, bfd_dplane_client_connect, bdc, 3,
+			&bdc->connectev);
 }
 
 static void bfd_dplane_client_init(const struct sockaddr *sa, socklen_t salen)
@@ -974,8 +974,8 @@ static void bfd_dplane_client_init(const struct sockaddr *sa, socklen_t salen)
 
 	bdc->client = true;
 
-	thread_add_timer(master, bfd_dplane_client_connect, bdc, 0,
-			 &bdc->connectev);
+	event_add_timer(master, bfd_dplane_client_connect, bdc, 0,
+			&bdc->connectev);
 
 	/* Insert into data plane lists. */
 	TAILQ_INSERT_TAIL(&bglobal.bg_dplaneq, bdc, entry);
@@ -1067,8 +1067,8 @@ void bfd_dplane_init(const struct sockaddr *sa, socklen_t salen, bool client)
 	}
 
 	bglobal.bg_dplane_sock = sock;
-	thread_add_read(master, bfd_dplane_accept, &bglobal, sock,
-			&bglobal.bg_dplane_sockev);
+	event_add_read(master, bfd_dplane_accept, &bglobal, sock,
+		       &bglobal.bg_dplane_sockev);
 }
 
 int bfd_dplane_add_session(struct bfd_session *bs)
diff --git a/bfdd/event.c b/bfdd/event.c
index 5a9ae39c3e..c6326ef91f 100644
--- a/bfdd/event.c
+++ b/bfdd/event.c
@@ -36,8 +36,8 @@ void bfd_recvtimer_update(struct bfd_session *bs)
 
 	tv_normalize(&tv);
 
-	thread_add_timer_tv(master, bfd_recvtimer_cb, bs, &tv,
-			    &bs->recvtimer_ev);
+	event_add_timer_tv(master, bfd_recvtimer_cb, bs, &tv,
+			   &bs->recvtimer_ev);
 }
 
 void bfd_echo_recvtimer_update(struct bfd_session *bs)
@@ -54,8 +54,8 @@ void bfd_echo_recvtimer_update(struct bfd_session *bs)
 
 	tv_normalize(&tv);
 
-	thread_add_timer_tv(master, bfd_echo_recvtimer_cb, bs, &tv,
-			    &bs->echo_recvtimer_ev);
+	event_add_timer_tv(master, bfd_echo_recvtimer_cb, bs, &tv,
+			   &bs->echo_recvtimer_ev);
 }
 
 void bfd_xmttimer_update(struct bfd_session *bs, uint64_t jitter)
@@ -72,7 +72,7 @@ void bfd_xmttimer_update(struct bfd_session *bs, uint64_t jitter)
 
 	tv_normalize(&tv);
 
-	thread_add_timer_tv(master, bfd_xmt_cb, bs, &tv, &bs->xmttimer_ev);
+	event_add_timer_tv(master, bfd_xmt_cb, bs, &tv, &bs->xmttimer_ev);
 }
 
 void bfd_echo_xmttimer_update(struct bfd_session *bs, uint64_t jitter)
@@ -89,8 +89,8 @@ void bfd_echo_xmttimer_update(struct bfd_session *bs, uint64_t jitter)
 
 	tv_normalize(&tv);
 
-	thread_add_timer_tv(master, bfd_echo_xmt_cb, bs, &tv,
-			    &bs->echo_xmttimer_ev);
+	event_add_timer_tv(master, bfd_echo_xmt_cb, bs, &tv,
+			   &bs->echo_xmttimer_ev);
 }
 
 void bfd_recvtimer_delete(struct bfd_session *bs)