*: Convert thread_add_XXX functions to event_add_XXX

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

9 files changed, 83 insertions, 84 deletions

diff --git a/nhrpd/netlink_arp.c b/nhrpd/netlink_arp.c
index 485aae7422..746cac044d 100644
--- a/nhrpd/netlink_arp.c
+++ b/nhrpd/netlink_arp.c
@@ -118,8 +118,8 @@ static void netlink_log_recv(struct event *t)
 		}
 	}
 
-	thread_add_read(master, netlink_log_recv, 0, netlink_log_fd,
-			&netlink_log_thread);
+	event_add_read(master, netlink_log_recv, 0, netlink_log_fd,
+		       &netlink_log_thread);
 }
 
 void netlink_set_nflog_group(int nlgroup)
@@ -136,8 +136,8 @@ void netlink_set_nflog_group(int nlgroup)
 			return;
 
 		netlink_log_register(netlink_log_fd, nlgroup);
-		thread_add_read(master, netlink_log_recv, 0, netlink_log_fd,
-				&netlink_log_thread);
+		event_add_read(master, netlink_log_recv, 0, netlink_log_fd,
+			       &netlink_log_thread);
 	}
 }
 
diff --git a/nhrpd/nhrp_cache.c b/nhrpd/nhrp_cache.c
index cb50dd52d9..8bc44f9474 100644
--- a/nhrpd/nhrp_cache.c
+++ b/nhrpd/nhrp_cache.c
@@ -325,8 +325,8 @@ static void nhrp_cache_update_timers(struct nhrp_cache *c)
 	switch (c->cur.type) {
 	case NHRP_CACHE_INVALID:
 		if (!c->t_auth)
-			thread_add_timer_msec(master, nhrp_cache_do_free, c, 10,
-					      &c->t_timeout);
+			event_add_timer_msec(master, nhrp_cache_do_free, c, 10,
+					     &c->t_timeout);
 		break;
 	case NHRP_CACHE_INCOMPLETE:
 	case NHRP_CACHE_NEGATIVE:
@@ -337,9 +337,9 @@ static void nhrp_cache_update_timers(struct nhrp_cache *c)
 	case NHRP_CACHE_LOCAL:
 	case NHRP_CACHE_NUM_TYPES:
 		if (c->cur.expires)
-			thread_add_timer(master, nhrp_cache_do_timeout, c,
-					 c->cur.expires - monotime(NULL),
-					 &c->t_timeout);
+			event_add_timer(master, nhrp_cache_do_timeout, c,
+					c->cur.expires - monotime(NULL),
+					&c->t_timeout);
 		break;
 	}
 }
@@ -413,8 +413,8 @@ static void nhrp_cache_newpeer_notifier(struct notifier_block *n,
 		if (nhrp_peer_check(c->new.peer, 1)) {
 			evmgr_notify("authorize-binding", c,
 				     nhrp_cache_authorize_binding);
-			thread_add_timer(master, nhrp_cache_do_auth_timeout, c,
-					 10, &c->t_auth);
+			event_add_timer(master, nhrp_cache_do_auth_timeout, c,
+					10, &c->t_auth);
 		}
 		break;
 	case NOTIFY_PEER_DOWN:
@@ -506,8 +506,8 @@ int nhrp_cache_update_binding(struct nhrp_cache *c, enum nhrp_cache_type type,
 					     nhrp_cache_newpeer_notifier);
 			nhrp_cache_newpeer_notifier(&c->newpeer_notifier,
 						    NOTIFY_PEER_UP);
-			thread_add_timer(master, nhrp_cache_do_auth_timeout, c,
-					 60, &c->t_auth);
+			event_add_timer(master, nhrp_cache_do_auth_timeout, c,
+					60, &c->t_auth);
 		}
 	}
 	nhrp_cache_update_timers(c);
diff --git a/nhrpd/nhrp_event.c b/nhrpd/nhrp_event.c
index ad98da9baa..3bcd42691b 100644
--- a/nhrpd/nhrp_event.c
+++ b/nhrpd/nhrp_event.c
@@ -40,8 +40,8 @@ static void evmgr_connection_error(struct event_manager *evmgr)
 		close(evmgr->fd);
 	evmgr->fd = -1;
 	if (nhrp_event_socket_path)
-		thread_add_timer_msec(master, evmgr_reconnect, evmgr, 10,
-				      &evmgr->t_reconnect);
+		event_add_timer_msec(master, evmgr_reconnect, evmgr, 10,
+				     &evmgr->t_reconnect);
 }
 
 static void evmgr_recv_message(struct event_manager *evmgr, struct zbuf *zb)
@@ -89,7 +89,7 @@ static void evmgr_read(struct event *t)
 	while (zbuf_may_pull_until(ibuf, "\n\n", &msg))
 		evmgr_recv_message(evmgr, &msg);
 
-	thread_add_read(master, evmgr_read, evmgr, evmgr->fd, &evmgr->t_read);
+	event_add_read(master, evmgr_read, evmgr, evmgr->fd, &evmgr->t_read);
 }
 
 static void evmgr_write(struct event *t)
@@ -99,8 +99,8 @@ static void evmgr_write(struct event *t)
 
 	r = zbufq_write(&evmgr->obuf, evmgr->fd);
 	if (r > 0) {
-		thread_add_write(master, evmgr_write, evmgr, evmgr->fd,
-				 &evmgr->t_write);
+		event_add_write(master, evmgr_write, evmgr, evmgr->fd,
+				&evmgr->t_write);
 	} else if (r < 0) {
 		evmgr_connection_error(evmgr);
 	}
@@ -175,8 +175,8 @@ static void evmgr_submit(struct event_manager *evmgr, struct zbuf *obuf)
 	zbuf_put(obuf, "\n", 1);
 	zbufq_queue(&evmgr->obuf, obuf);
 	if (evmgr->fd >= 0)
-		thread_add_write(master, evmgr_write, evmgr, evmgr->fd,
-				 &evmgr->t_write);
+		event_add_write(master, evmgr_write, evmgr, evmgr->fd,
+				&evmgr->t_write);
 }
 
 static void evmgr_reconnect(struct event *t)
@@ -192,14 +192,14 @@ static void evmgr_reconnect(struct event *t)
 		zlog_warn("%s: failure connecting nhrp-event socket: %s",
 			  __func__, strerror(errno));
 		zbufq_reset(&evmgr->obuf);
-		thread_add_timer(master, evmgr_reconnect, evmgr, 10,
-				 &evmgr->t_reconnect);
+		event_add_timer(master, evmgr_reconnect, evmgr, 10,
+				&evmgr->t_reconnect);
 		return;
 	}
 
 	zlog_info("Connected to Event Manager");
 	evmgr->fd = fd;
-	thread_add_read(master, evmgr_read, evmgr, evmgr->fd, &evmgr->t_read);
+	event_add_read(master, evmgr_read, evmgr, evmgr->fd, &evmgr->t_read);
 }
 
 static struct event_manager evmgr_connection;
@@ -211,8 +211,8 @@ void evmgr_init(void)
 	evmgr->fd = -1;
 	zbuf_init(&evmgr->ibuf, evmgr->ibuf_data, sizeof(evmgr->ibuf_data), 0);
 	zbufq_init(&evmgr->obuf);
-	thread_add_timer_msec(master, evmgr_reconnect, evmgr, 10,
-			      &evmgr->t_reconnect);
+	event_add_timer_msec(master, evmgr_reconnect, evmgr, 10,
+			     &evmgr->t_reconnect);
 }
 
 void evmgr_set_socket(const char *socket)
diff --git a/nhrpd/nhrp_multicast.c b/nhrpd/nhrp_multicast.c
index db85d550c2..759dbd1b92 100644
--- a/nhrpd/nhrp_multicast.c
+++ b/nhrpd/nhrp_multicast.c
@@ -160,8 +160,8 @@ static void netlink_mcast_log_recv(struct event *t)
 		}
 	}
 
-	thread_add_read(master, netlink_mcast_log_recv, 0, netlink_mcast_log_fd,
-			&netlink_mcast_log_thread);
+	event_add_read(master, netlink_mcast_log_recv, 0, netlink_mcast_log_fd,
+		       &netlink_mcast_log_thread);
 }
 
 static void netlink_mcast_log_register(int fd, int group)
@@ -202,9 +202,8 @@ void netlink_mcast_set_nflog_group(int nlgroup)
 			return;
 
 		netlink_mcast_log_register(netlink_mcast_log_fd, nlgroup);
-		thread_add_read(master, netlink_mcast_log_recv, 0,
-				netlink_mcast_log_fd,
-				&netlink_mcast_log_thread);
+		event_add_read(master, netlink_mcast_log_recv, 0,
+			       netlink_mcast_log_fd, &netlink_mcast_log_thread);
 		debugf(NHRP_DEBUG_COMMON, "Register nflog group: %d",
 		       netlink_mcast_nflog_group);
 	}
diff --git a/nhrpd/nhrp_nhs.c b/nhrpd/nhrp_nhs.c
index c6a6b8e75d..9ffb0c095f 100644
--- a/nhrpd/nhrp_nhs.c
+++ b/nhrpd/nhrp_nhs.c
@@ -92,8 +92,8 @@ static void nhrp_reg_reply(struct nhrp_reqid *reqid, void *arg)
 
 	/* RFC 2332 5.2.3 - Registration is recommend to be renewed
 	 * every one third of holdtime */
-	thread_add_timer(master, nhrp_reg_send_req, r, holdtime / 3,
-			 &r->t_register);
+	event_add_timer(master, nhrp_reg_send_req, r, holdtime / 3,
+			&r->t_register);
 
 	r->proto_addr = p->dst_proto;
 	c = nhrp_cache_get(ifp, &p->dst_proto, 1);
@@ -133,7 +133,7 @@ static void nhrp_reg_timeout(struct event *t)
 		}
 		r->timeout = 2;
 	}
-	thread_add_timer_msec(master, nhrp_reg_send_req, r, 10, &r->t_register);
+	event_add_timer_msec(master, nhrp_reg_send_req, r, 10, &r->t_register);
 }
 
 static void nhrp_reg_peer_notify(struct notifier_block *n, unsigned long cmd)
@@ -149,8 +149,8 @@ static void nhrp_reg_peer_notify(struct notifier_block *n, unsigned long cmd)
 		debugf(NHRP_DEBUG_COMMON, "NHS: Flush timer for %pSU",
 		       &r->peer->vc->remote.nbma);
 		THREAD_OFF(r->t_register);
-		thread_add_timer_msec(master, nhrp_reg_send_req, r, 10,
-				      &r->t_register);
+		event_add_timer_msec(master, nhrp_reg_send_req, r, 10,
+				     &r->t_register);
 		break;
 	}
 }
@@ -171,13 +171,13 @@ static void nhrp_reg_send_req(struct event *t)
 	if (!nhrp_peer_check(r->peer, 2)) {
 		debugf(NHRP_DEBUG_COMMON, "NHS: Waiting link for %pSU",
 		       &r->peer->vc->remote.nbma);
-		thread_add_timer(master, nhrp_reg_send_req, r, 120,
-				 &r->t_register);
+		event_add_timer(master, nhrp_reg_send_req, r, 120,
+				&r->t_register);
 		return;
 	}
 
-	thread_add_timer(master, nhrp_reg_timeout, r, r->timeout,
-			 &r->t_register);
+	event_add_timer(master, nhrp_reg_timeout, r, r->timeout,
+			&r->t_register);
 
 	/* RFC2332 5.2.3 NHC uses it's own address as dst if NHS is unknown */
 	dst_proto = &nhs->proto_addr;
@@ -269,13 +269,13 @@ static void nhrp_nhs_resolve_cb(struct resolver_query *q, const char *errstr,
 
 	if (n < 0) {
 		/* Failed, retry in a moment */
-		thread_add_timer(master, nhrp_nhs_resolve, nhs, 5,
-				 &nhs->t_resolve);
+		event_add_timer(master, nhrp_nhs_resolve, nhs, 5,
+				&nhs->t_resolve);
 		return;
 	}
 
-	thread_add_timer(master, nhrp_nhs_resolve, nhs, 2 * 60 * 60,
-			 &nhs->t_resolve);
+	event_add_timer(master, nhrp_nhs_resolve, nhs, 2 * 60 * 60,
+			&nhs->t_resolve);
 
 	frr_each (nhrp_reglist, &nhs->reglist_head, reg)
 		reg->mark = 1;
@@ -300,8 +300,8 @@ static void nhrp_nhs_resolve_cb(struct resolver_query *q, const char *errstr,
 		nhrp_reglist_add_tail(&nhs->reglist_head, reg);
 		nhrp_peer_notify_add(reg->peer, &reg->peer_notifier,
 				     nhrp_reg_peer_notify);
-		thread_add_timer_msec(master, nhrp_reg_send_req, reg, 50,
-				      &reg->t_register);
+		event_add_timer_msec(master, nhrp_reg_send_req, reg, 50,
+				     &reg->t_register);
 	}
 
 	frr_each_safe (nhrp_reglist, &nhs->reglist_head, reg)
@@ -347,8 +347,8 @@ int nhrp_nhs_add(struct interface *ifp, afi_t afi, union sockunion *proto_addr,
 		.reglist_head = INIT_DLIST(nhs->reglist_head),
 	};
 	nhrp_nhslist_add_tail(&nifp->afi[afi].nhslist_head, nhs);
-	thread_add_timer_msec(master, nhrp_nhs_resolve, nhs, 1000,
-			      &nhs->t_resolve);
+	event_add_timer_msec(master, nhrp_nhs_resolve, nhs, 1000,
+			     &nhs->t_resolve);
 
 	return NHRP_OK;
 }
diff --git a/nhrpd/nhrp_packet.c b/nhrpd/nhrp_packet.c
index 650b3ab875..6502cff51e 100644
--- a/nhrpd/nhrp_packet.c
+++ b/nhrpd/nhrp_packet.c
@@ -296,7 +296,7 @@ static void nhrp_packet_recvraw(struct event *t)
 	uint8_t addr[64];
 	size_t len, addrlen;
 
-	thread_add_read(master, nhrp_packet_recvraw, 0, fd, NULL);
+	event_add_read(master, nhrp_packet_recvraw, 0, fd, NULL);
 
 	zb = zbuf_alloc(1500);
 	if (!zb)
@@ -336,6 +336,6 @@ err:
 
 int nhrp_packet_init(void)
 {
-	thread_add_read(master, nhrp_packet_recvraw, 0, os_socket(), NULL);
+	event_add_read(master, nhrp_packet_recvraw, 0, os_socket(), NULL);
 	return 0;
 }
diff --git a/nhrpd/nhrp_peer.c b/nhrpd/nhrp_peer.c
index 95694a41fd..9ca7b8441c 100644
--- a/nhrpd/nhrp_peer.c
+++ b/nhrpd/nhrp_peer.c
@@ -82,8 +82,8 @@ static void __nhrp_peer_check(struct nhrp_peer *p)
 			 * the up notification a bit to allow things
 			 * settle down. This allows IKE to install
 			 * SPDs and SAs. */
-			thread_add_timer_msec(master, nhrp_peer_notify_up, p,
-					      50, &p->t_fallback);
+			event_add_timer_msec(master, nhrp_peer_notify_up, p, 50,
+					     &p->t_fallback);
 		} else {
 			nhrp_peer_ref(p);
 			p->online = online;
@@ -264,8 +264,8 @@ static void nhrp_peer_request_timeout(struct event *t)
 		p->fallback_requested = 1;
 		vici_request_vc(nifp->ipsec_fallback_profile, &vc->local.nbma,
 				&vc->remote.nbma, p->prio);
-		thread_add_timer(master, nhrp_peer_request_timeout, p, 30,
-				 &p->t_fallback);
+		event_add_timer(master, nhrp_peer_request_timeout, p, 30,
+				&p->t_fallback);
 	} else {
 		p->requested = p->fallback_requested = 0;
 	}
@@ -287,10 +287,10 @@ static void nhrp_peer_defer_vici_request(struct event *t)
 	} else {
 		vici_request_vc(nifp->ipsec_profile, &vc->local.nbma,
 				&vc->remote.nbma, p->prio);
-		thread_add_timer(
-			master, nhrp_peer_request_timeout, p,
-			(nifp->ipsec_fallback_profile && !p->prio) ? 15 : 30,
-			&p->t_fallback);
+		event_add_timer(master, nhrp_peer_request_timeout, p,
+				(nifp->ipsec_fallback_profile && !p->prio) ? 15
+									   : 30,
+				&p->t_fallback);
 	}
 }
 
@@ -320,10 +320,10 @@ int nhrp_peer_check(struct nhrp_peer *p, int establish)
 	if (p->prio) {
 		vici_request_vc(nifp->ipsec_profile, &vc->local.nbma,
 				&vc->remote.nbma, p->prio);
-		thread_add_timer(
-			master, nhrp_peer_request_timeout, p,
-			(nifp->ipsec_fallback_profile && !p->prio) ? 15 : 30,
-			&p->t_fallback);
+		event_add_timer(master, nhrp_peer_request_timeout, p,
+				(nifp->ipsec_fallback_profile && !p->prio) ? 15
+									   : 30,
+				&p->t_fallback);
 	} else {
 		/* Maximum timeout is 1 second */
 		int r_time_ms = frr_weak_random() % 1000;
@@ -331,8 +331,8 @@ int nhrp_peer_check(struct nhrp_peer *p, int establish)
 		debugf(NHRP_DEBUG_COMMON,
 		       "Initiating IPsec connection request to %pSU after %d ms:",
 		       &vc->remote.nbma, r_time_ms);
-		thread_add_timer_msec(master, nhrp_peer_defer_vici_request,
-				      p, r_time_ms, &p->t_timer);
+		event_add_timer_msec(master, nhrp_peer_defer_vici_request, p,
+				     r_time_ms, &p->t_timer);
 	}
 
 	return 0;
diff --git a/nhrpd/nhrp_shortcut.c b/nhrpd/nhrp_shortcut.c
index b1e2b7cea4..838fac7528 100644
--- a/nhrpd/nhrp_shortcut.c
+++ b/nhrpd/nhrp_shortcut.c
@@ -35,8 +35,8 @@ static void nhrp_shortcut_do_expire(struct event *t)
 {
 	struct nhrp_shortcut *s = THREAD_ARG(t);
 
-	thread_add_timer(master, nhrp_shortcut_do_purge, s, s->holding_time / 3,
-			 &s->t_timer);
+	event_add_timer(master, nhrp_shortcut_do_purge, s, s->holding_time / 3,
+			&s->t_timer);
 	s->expiring = 1;
 	nhrp_shortcut_check_use(s);
 }
@@ -127,8 +127,8 @@ static void nhrp_shortcut_update_binding(struct nhrp_shortcut *s,
 	if (holding_time) {
 		s->expiring = 0;
 		s->holding_time = holding_time;
-		thread_add_timer(master, nhrp_shortcut_do_expire, s,
-				 2 * holding_time / 3, &s->t_timer);
+		event_add_timer(master, nhrp_shortcut_do_expire, s,
+				2 * holding_time / 3, &s->t_timer);
 	}
 }
 
@@ -205,7 +205,7 @@ static void nhrp_shortcut_recv_resolution_rep(struct nhrp_reqid *reqid,
 
 	nhrp_reqid_free(&nhrp_packet_reqid, &s->reqid);
 	THREAD_OFF(s->t_timer);
-	thread_add_timer(master, nhrp_shortcut_do_purge, s, 1, &s->t_timer);
+	event_add_timer(master, nhrp_shortcut_do_purge, s, 1, &s->t_timer);
 
 	if (pp->hdr->type != NHRP_PACKET_RESOLUTION_REPLY) {
 		if (pp->hdr->type == NHRP_PACKET_ERROR_INDICATION
@@ -455,8 +455,8 @@ void nhrp_shortcut_initiate(union sockunion *addr)
 	if (s && s->type != NHRP_CACHE_INCOMPLETE) {
 		s->addr = *addr;
 		THREAD_OFF(s->t_timer);
-		thread_add_timer(master, nhrp_shortcut_do_purge, s, 30,
-				 &s->t_timer);
+		event_add_timer(master, nhrp_shortcut_do_purge, s, 30,
+				&s->t_timer);
 		nhrp_shortcut_send_resolution_req(s);
 	}
 }
@@ -504,8 +504,8 @@ void nhrp_shortcut_purge(struct nhrp_shortcut *s, int force)
 
 	if (force) {
 		/* Immediate purge on route with draw or pending shortcut */
-		thread_add_timer_msec(master, nhrp_shortcut_do_purge, s, 5,
-				      &s->t_timer);
+		event_add_timer_msec(master, nhrp_shortcut_do_purge, s, 5,
+				     &s->t_timer);
 	} else {
 		/* Soft expire - force immediate renewal, but purge
 		 * in few seconds to make sure stale route is not
@@ -514,8 +514,8 @@ void nhrp_shortcut_purge(struct nhrp_shortcut *s, int force)
 		 * This allows to keep nhrp route up, and to not
 		 * cause temporary rerouting via hubs causing latency
 		 * jitter. */
-		thread_add_timer_msec(master, nhrp_shortcut_do_purge, s, 3000,
-				      &s->t_timer);
+		event_add_timer_msec(master, nhrp_shortcut_do_purge, s, 3000,
+				     &s->t_timer);
 		s->expiring = 1;
 		nhrp_shortcut_check_use(s);
 	}
diff --git a/nhrpd/vici.c b/nhrpd/vici.c
index 02e36d2e6a..67a7877b6d 100644
--- a/nhrpd/vici.c
+++ b/nhrpd/vici.c
@@ -77,7 +77,7 @@ static void vici_connection_error(struct vici_conn *vici)
 
 	close(vici->fd);
 	vici->fd = -1;
-	thread_add_timer(master, vici_reconnect, vici, 2, &vici->t_reconnect);
+	event_add_timer(master, vici_reconnect, vici, 2, &vici->t_reconnect);
 }
 
 static void vici_parse_message(struct vici_conn *vici, struct zbuf *msg,
@@ -384,7 +384,7 @@ static void vici_read(struct event *t)
 		vici_recv_message(vici, &pktbuf);
 	} while (1);
 
-	thread_add_read(master, vici_read, vici, vici->fd, &vici->t_read);
+	event_add_read(master, vici_read, vici, vici->fd, &vici->t_read);
 }
 
 static void vici_write(struct event *t)
@@ -394,8 +394,8 @@ static void vici_write(struct event *t)
 
 	r = zbufq_write(&vici->obuf, vici->fd);
 	if (r > 0) {
-		thread_add_write(master, vici_write, vici, vici->fd,
-				 &vici->t_write);
+		event_add_write(master, vici_write, vici, vici->fd,
+				&vici->t_write);
 	} else if (r < 0) {
 		vici_connection_error(vici);
 	}
@@ -409,7 +409,7 @@ static void vici_submit(struct vici_conn *vici, struct zbuf *obuf)
 	}
 
 	zbufq_queue(&vici->obuf, obuf);
-	thread_add_write(master, vici_write, vici, vici->fd, &vici->t_write);
+	event_add_write(master, vici_write, vici, vici->fd, &vici->t_write);
 }
 
 static void vici_submit_request(struct vici_conn *vici, const char *name, ...)
@@ -519,14 +519,14 @@ static void vici_reconnect(struct event *t)
 		debugf(NHRP_DEBUG_VICI,
 		       "%s: failure connecting VICI socket: %s", __func__,
 		       strerror(errno));
-		thread_add_timer(master, vici_reconnect, vici, 2,
-				 &vici->t_reconnect);
+		event_add_timer(master, vici_reconnect, vici, 2,
+				&vici->t_reconnect);
 		return;
 	}
 
 	debugf(NHRP_DEBUG_COMMON, "VICI: Connected");
 	vici->fd = fd;
-	thread_add_read(master, vici_read, vici, vici->fd, &vici->t_read);
+	event_add_read(master, vici_read, vici, vici->fd, &vici->t_read);
 
 	/* Send event subscribtions */
 	// vici_register_event(vici, "child-updown");
@@ -547,8 +547,8 @@ void vici_init(void)
 	vici->fd = -1;
 	zbuf_init(&vici->ibuf, vici->ibuf_data, sizeof(vici->ibuf_data), 0);
 	zbufq_init(&vici->obuf);
-	thread_add_timer_msec(master, vici_reconnect, vici, 10,
-			      &vici->t_reconnect);
+	event_add_timer_msec(master, vici_reconnect, vici, 10,
+			     &vici->t_reconnect);
 }
 
 void vici_terminate(void)