*: Convert THREAD_XXX macros to EVENT_XXX macros

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

4 files changed, 38 insertions, 38 deletions

diff --git a/ripd/rip_interface.c b/ripd/rip_interface.c
index a085bc3f96..db85025504 100644
--- a/ripd/rip_interface.c
+++ b/ripd/rip_interface.c
@@ -413,7 +413,7 @@ static void rip_interface_clean(struct rip_interface *ri)
 	ri->enable_interface = 0;
 	ri->running = 0;
 
-	THREAD_OFF(ri->t_wakeup);
+	EVENT_OFF(ri->t_wakeup);
 }
 
 void rip_interfaces_clean(struct rip *rip)
@@ -472,7 +472,7 @@ int rip_if_down(struct interface *ifp)
 
 	ri = ifp->info;
 
-	THREAD_OFF(ri->t_wakeup);
+	EVENT_OFF(ri->t_wakeup);
 
 	rip = ri->rip;
 	if (rip) {
@@ -780,7 +780,7 @@ static void rip_interface_wakeup(struct event *t)
 	struct rip_interface *ri;
 
 	/* Get interface. */
-	ifp = THREAD_ARG(t);
+	ifp = EVENT_ARG(t);
 
 	ri = ifp->info;
 
diff --git a/ripd/rip_nb_rpcs.c b/ripd/rip_nb_rpcs.c
index be55284819..bbe3d0f0f8 100644
--- a/ripd/rip_nb_rpcs.c
+++ b/ripd/rip_nb_rpcs.c
@@ -51,8 +51,8 @@ static void clear_rip_route(struct rip *rip)
 		}
 
 		if (rinfo) {
-			THREAD_OFF(rinfo->t_timeout);
-			THREAD_OFF(rinfo->t_garbage_collect);
+			EVENT_OFF(rinfo->t_timeout);
+			EVENT_OFF(rinfo->t_garbage_collect);
 			listnode_delete(list, rinfo);
 			rip_info_free(rinfo);
 		}
diff --git a/ripd/rip_peer.c b/ripd/rip_peer.c
index 99338f4e8a..0f5a145578 100644
--- a/ripd/rip_peer.c
+++ b/ripd/rip_peer.c
@@ -23,7 +23,7 @@ static struct rip_peer *rip_peer_new(void)
 
 static void rip_peer_free(struct rip_peer *peer)
 {
-	THREAD_OFF(peer->t_timeout);
+	EVENT_OFF(peer->t_timeout);
 	XFREE(MTYPE_RIP_PEER, peer);
 }
 
@@ -56,7 +56,7 @@ static void rip_peer_timeout(struct event *t)
 {
 	struct rip_peer *peer;
 
-	peer = THREAD_ARG(t);
+	peer = EVENT_ARG(t);
 	listnode_delete(peer->rip->peer_list, peer);
 	rip_peer_free(peer);
 }
@@ -69,7 +69,7 @@ static struct rip_peer *rip_peer_get(struct rip *rip, struct in_addr *addr)
 	peer = rip_peer_lookup(rip, addr);
 
 	if (peer) {
-		THREAD_OFF(peer->t_timeout);
+		EVENT_OFF(peer->t_timeout);
 	} else {
 		peer = rip_peer_new();
 		peer->rip = rip;
diff --git a/ripd/ripd.c b/ripd/ripd.c
index 7661767514..5e07ca48f9 100644
--- a/ripd/ripd.c
+++ b/ripd/ripd.c
@@ -126,10 +126,10 @@ static void rip_garbage_collect(struct event *t)
 	struct rip_info *rinfo;
 	struct route_node *rp;
 
-	rinfo = THREAD_ARG(t);
+	rinfo = EVENT_ARG(t);
 
 	/* Off timeout timer. */
-	THREAD_OFF(rinfo->t_timeout);
+	EVENT_OFF(rinfo->t_timeout);
 
 	/* Get route_node pointer. */
 	rp = rinfo->rp;
@@ -211,14 +211,14 @@ struct rip_info *rip_ecmp_replace(struct rip *rip, struct rip_info *rinfo_new)
 		if (tmp_rinfo == rinfo)
 			continue;
 
-		THREAD_OFF(tmp_rinfo->t_timeout);
-		THREAD_OFF(tmp_rinfo->t_garbage_collect);
+		EVENT_OFF(tmp_rinfo->t_timeout);
+		EVENT_OFF(tmp_rinfo->t_garbage_collect);
 		list_delete_node(list, node);
 		rip_info_free(tmp_rinfo);
 	}
 
-	THREAD_OFF(rinfo->t_timeout);
-	THREAD_OFF(rinfo->t_garbage_collect);
+	EVENT_OFF(rinfo->t_timeout);
+	EVENT_OFF(rinfo->t_garbage_collect);
 	memcpy(rinfo, rinfo_new, sizeof(struct rip_info));
 
 	if (rip_route_rte(rinfo)) {
@@ -247,12 +247,12 @@ struct rip_info *rip_ecmp_delete(struct rip *rip, struct rip_info *rinfo)
 	struct route_node *rp = rinfo->rp;
 	struct list *list = (struct list *)rp->info;
 
-	THREAD_OFF(rinfo->t_timeout);
+	EVENT_OFF(rinfo->t_timeout);
 
 	if (listcount(list) > 1) {
 		/* Some other ECMP entries still exist. Just delete this entry.
 		 */
-		THREAD_OFF(rinfo->t_garbage_collect);
+		EVENT_OFF(rinfo->t_garbage_collect);
 		listnode_delete(list, rinfo);
 		if (rip_route_rte(rinfo)
 		    && CHECK_FLAG(rinfo->flags, RIP_RTF_FIB))
@@ -289,7 +289,7 @@ struct rip_info *rip_ecmp_delete(struct rip *rip, struct rip_info *rinfo)
 /* Timeout RIP routes. */
 static void rip_timeout(struct event *t)
 {
-	struct rip_info *rinfo = THREAD_ARG(t);
+	struct rip_info *rinfo = EVENT_ARG(t);
 	struct rip *rip = rip_info_get_instance(rinfo);
 
 	rip_ecmp_delete(rip, rinfo);
@@ -298,7 +298,7 @@ static void rip_timeout(struct event *t)
 static void rip_timeout_update(struct rip *rip, struct rip_info *rinfo)
 {
 	if (rinfo->metric != RIP_METRIC_INFINITY) {
-		THREAD_OFF(rinfo->t_timeout);
+		EVENT_OFF(rinfo->t_timeout);
 		event_add_timer(master, rip_timeout, rinfo, rip->timeout_time,
 				&rinfo->t_timeout);
 	}
@@ -644,8 +644,8 @@ static void rip_rte_process(struct rte *rte, struct sockaddr_in *from,
 					assert(newinfo.metric
 					       != RIP_METRIC_INFINITY);
 
-					THREAD_OFF(rinfo->t_timeout);
-					THREAD_OFF(rinfo->t_garbage_collect);
+					EVENT_OFF(rinfo->t_timeout);
+					EVENT_OFF(rinfo->t_garbage_collect);
 					memcpy(rinfo, &newinfo,
 					       sizeof(struct rip_info));
 					rip_timeout_update(rip, rinfo);
@@ -1598,7 +1598,7 @@ void rip_redistribute_delete(struct rip *rip, int type, int sub_type,
 				RIP_TIMER_ON(rinfo->t_garbage_collect,
 					     rip_garbage_collect,
 					     rip->garbage_time);
-				THREAD_OFF(rinfo->t_timeout);
+				EVENT_OFF(rinfo->t_timeout);
 				rinfo->flags |= RIP_RTF_CHANGED;
 
 				if (IS_RIP_DEBUG_EVENT)
@@ -1699,7 +1699,7 @@ static void rip_request_process(struct rip_packet *packet, int size,
 /* First entry point of RIP packet. */
 static void rip_read(struct event *t)
 {
-	struct rip *rip = THREAD_ARG(t);
+	struct rip *rip = EVENT_ARG(t);
 	int sock;
 	int ret;
 	int rtenum;
@@ -1715,7 +1715,7 @@ static void rip_read(struct event *t)
 	struct prefix p;
 
 	/* Fetch socket then register myself. */
-	sock = THREAD_FD(t);
+	sock = EVENT_FD(t);
 
 	/* Add myself to tne next event */
 	rip_event(rip, RIP_READ, sock);
@@ -2480,7 +2480,7 @@ static void rip_update_process(struct rip *rip, int route_type)
 /* RIP's periodical timer. */
 static void rip_update(struct event *t)
 {
-	struct rip *rip = THREAD_ARG(t);
+	struct rip *rip = EVENT_ARG(t);
 
 	if (IS_RIP_DEBUG_EVENT)
 		zlog_debug("update timer fire!");
@@ -2490,7 +2490,7 @@ static void rip_update(struct event *t)
 
 	/* Triggered updates may be suppressed if a regular update is due by
 	   the time the triggered update would be sent. */
-	THREAD_OFF(rip->t_triggered_interval);
+	EVENT_OFF(rip->t_triggered_interval);
 	rip->trigger = 0;
 
 	/* Register myself. */
@@ -2522,7 +2522,7 @@ static void rip_clear_changed_flag(struct rip *rip)
 /* Triggered update interval timer. */
 static void rip_triggered_interval(struct event *t)
 {
-	struct rip *rip = THREAD_ARG(t);
+	struct rip *rip = EVENT_ARG(t);
 
 	if (rip->trigger) {
 		rip->trigger = 0;
@@ -2533,11 +2533,11 @@ static void rip_triggered_interval(struct event *t)
 /* Execute triggered update. */
 static void rip_triggered_update(struct event *t)
 {
-	struct rip *rip = THREAD_ARG(t);
+	struct rip *rip = EVENT_ARG(t);
 	int interval;
 
 	/* Cancel interval timer. */
-	THREAD_OFF(rip->t_triggered_interval);
+	EVENT_OFF(rip->t_triggered_interval);
 	rip->trigger = 0;
 
 	/* Logging triggered update. */
@@ -2587,7 +2587,7 @@ void rip_redistribute_withdraw(struct rip *rip, int type)
 		rinfo->metric = RIP_METRIC_INFINITY;
 		RIP_TIMER_ON(rinfo->t_garbage_collect, rip_garbage_collect,
 			     rip->garbage_time);
-		THREAD_OFF(rinfo->t_timeout);
+		EVENT_OFF(rinfo->t_timeout);
 		rinfo->flags |= RIP_RTF_CHANGED;
 
 		if (IS_RIP_DEBUG_EVENT) {
@@ -2769,7 +2769,7 @@ void rip_event(struct rip *rip, enum rip_event event, int sock)
 		event_add_read(master, rip_read, rip, sock, &rip->t_read);
 		break;
 	case RIP_UPDATE_EVENT:
-		THREAD_OFF(rip->t_update);
+		EVENT_OFF(rip->t_update);
 		jitter = rip_update_jitter(rip->update_time);
 		event_add_timer(master, rip_update, rip,
 				sock ? 2 : rip->update_time + jitter,
@@ -2899,8 +2899,8 @@ void rip_ecmp_disable(struct rip *rip)
 			if (tmp_rinfo == rinfo)
 				continue;
 
-			THREAD_OFF(tmp_rinfo->t_timeout);
-			THREAD_OFF(tmp_rinfo->t_garbage_collect);
+			EVENT_OFF(tmp_rinfo->t_timeout);
+			EVENT_OFF(tmp_rinfo->t_garbage_collect);
 			list_delete_node(list, node);
 			rip_info_free(tmp_rinfo);
 		}
@@ -3492,8 +3492,8 @@ static void rip_instance_disable(struct rip *rip)
 			rip_zebra_ipv4_delete(rip, rp);
 
 		for (ALL_LIST_ELEMENTS_RO(list, listnode, rinfo)) {
-			THREAD_OFF(rinfo->t_timeout);
-			THREAD_OFF(rinfo->t_garbage_collect);
+			EVENT_OFF(rinfo->t_timeout);
+			EVENT_OFF(rinfo->t_garbage_collect);
 			rip_info_free(rinfo);
 		}
 		list_delete(&list);
@@ -3505,12 +3505,12 @@ static void rip_instance_disable(struct rip *rip)
 	rip_redistribute_disable(rip);
 
 	/* Cancel RIP related timers. */
-	THREAD_OFF(rip->t_update);
-	THREAD_OFF(rip->t_triggered_update);
-	THREAD_OFF(rip->t_triggered_interval);
+	EVENT_OFF(rip->t_update);
+	EVENT_OFF(rip->t_triggered_update);
+	EVENT_OFF(rip->t_triggered_interval);
 
 	/* Cancel read thread. */
-	THREAD_OFF(rip->t_read);
+	EVENT_OFF(rip->t_read);
 
 	/* Close RIP socket. */
 	close(rip->sock);