*: Convert thread_add_XXX functions to event_add_XXX

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

3 files changed, 23 insertions, 24 deletions

diff --git a/pathd/path_pcep_controller.c b/pathd/path_pcep_controller.c
index 92ab5a63bd..7df3143129 100644
--- a/pathd/path_pcep_controller.c
+++ b/pathd/path_pcep_controller.c
@@ -319,8 +319,8 @@ int pcep_ctrl_send_error(struct frr_pthread *fpt, int pcc_id,
 
 int pcep_ctrl_halt_cb(struct frr_pthread *fpt, void **res)
 {
-	thread_add_event(fpt->master, pcep_thread_finish_event_handler,
-			 (void *)fpt, 0, NULL);
+	event_add_event(fpt->master, pcep_thread_finish_event_handler,
+			(void *)fpt, 0, NULL);
 	pthread_join(fpt->thread, res);
 
 	return 0;
@@ -469,8 +469,8 @@ int pcep_thread_refine_path(struct ctrl_state *ctrl_state, int pcc_id,
 	data->continue_lsp_update_handler = cb;
 	data->payload = payload;
 
-	thread_add_event(ctrl_state->main, pcep_refine_path_event_cb,
-			 (void *)data, 0, NULL);
+	event_add_event(ctrl_state->main, pcep_refine_path_event_cb,
+			(void *)data, 0, NULL);
 	return 0;
 }
 
@@ -535,8 +535,8 @@ int schedule_thread_timer_with_cb(struct ctrl_state *ctrl_state, int pcc_id,
 	data->pcc_id = pcc_id;
 	data->payload = payload;
 
-	thread_add_timer(ctrl_state->self, timer_cb, (void *)data, delay,
-			 thread);
+	event_add_timer(ctrl_state->self, timer_cb, (void *)data, delay,
+			thread);
 
 	return 0;
 }
@@ -640,11 +640,11 @@ int schedule_thread_socket(struct ctrl_state *ctrl_state, int pcc_id,
 	data->payload = payload;
 
 	if (is_read) {
-		thread_add_read(ctrl_state->self, socket_cb, (void *)data, fd,
-				thread);
+		event_add_read(ctrl_state->self, socket_cb, (void *)data, fd,
+			       thread);
 	} else {
-		thread_add_write(ctrl_state->self, socket_cb, (void *)data, fd,
-				 thread);
+		event_add_write(ctrl_state->self, socket_cb, (void *)data, fd,
+				thread);
 	}
 
 	return 0;
@@ -702,7 +702,7 @@ int send_to_thread_with_cb(struct ctrl_state *ctrl_state, int pcc_id,
 	data->pcc_id = pcc_id;
 	data->payload = payload;
 
-	thread_add_event(ctrl_state->self, event_cb, (void *)data, 0, NULL);
+	event_add_event(ctrl_state->self, event_cb, (void *)data, 0, NULL);
 
 	return 0;
 }
@@ -964,8 +964,8 @@ int send_to_main(struct ctrl_state *ctrl_state, int pcc_id,
 	data->pcc_id = pcc_id;
 	data->payload = payload;
 
-	thread_add_event(ctrl_state->main, pcep_main_event_handler,
-			 (void *)data, 0, NULL);
+	event_add_event(ctrl_state->main, pcep_main_event_handler, (void *)data,
+			0, NULL);
 	return 0;
 }
 
diff --git a/pathd/path_ted.c b/pathd/path_ted.c
index d39371041f..0a2a74cb42 100644
--- a/pathd/path_ted.c
+++ b/pathd/path_ted.c
@@ -583,9 +583,9 @@ enum zclient_send_status path_ted_link_state_sync(void)
 		PATH_TED_DEBUG("%s: PATHD-TED: Opaque asked for TED sync ",
 			       __func__);
 	}
-	thread_add_timer(ted_state_g.main, path_ted_timer_handler_sync,
-			 &ted_state_g, ted_state_g.link_state_delay_interval,
-			 &ted_state_g.t_link_state_sync);
+	event_add_timer(ted_state_g.main, path_ted_timer_handler_sync,
+			&ted_state_g, ted_state_g.link_state_delay_interval,
+			&ted_state_g.t_link_state_sync);
 
 	return status;
 }
@@ -619,10 +619,9 @@ int path_ted_segment_list_refresh(void)
 	int status = 0;
 
 	path_ted_timer_refresh_cancel();
-	thread_add_timer(ted_state_g.main, path_ted_timer_handler_refresh,
-			 &ted_state_g,
-			 ted_state_g.segment_list_refresh_interval,
-			 &ted_state_g.t_segment_list_refresh);
+	event_add_timer(ted_state_g.main, path_ted_timer_handler_refresh,
+			&ted_state_g, ted_state_g.segment_list_refresh_interval,
+			&ted_state_g.t_segment_list_refresh);
 
 	return status;
 }
diff --git a/pathd/pathd.c b/pathd/pathd.c
index b11d90905a..0b7792a5cc 100644
--- a/pathd/pathd.c
+++ b/pathd/pathd.c
@@ -1293,8 +1293,8 @@ void trigger_pathd_candidate_created(struct srte_candidate *candidate)
 	from changing the candidate by hand with the console */
 	if (candidate->hook_timer != NULL)
 		return;
-	thread_add_timer(master, trigger_pathd_candidate_created_timer,
-			 (void *)candidate, HOOK_DELAY, &candidate->hook_timer);
+	event_add_timer(master, trigger_pathd_candidate_created_timer,
+			(void *)candidate, HOOK_DELAY, &candidate->hook_timer);
 }
 
 void trigger_pathd_candidate_created_timer(struct event *thread)
@@ -1313,8 +1313,8 @@ void trigger_pathd_candidate_updated(struct srte_candidate *candidate)
 	from changing the candidate by hand with the console */
 	if (candidate->hook_timer != NULL)
 		return;
-	thread_add_timer(master, trigger_pathd_candidate_updated_timer,
-			 (void *)candidate, HOOK_DELAY, &candidate->hook_timer);
+	event_add_timer(master, trigger_pathd_candidate_updated_timer,
+			(void *)candidate, HOOK_DELAY, &candidate->hook_timer);
 }
 
 void trigger_pathd_candidate_updated_timer(struct event *thread)