*: Rename `struct thread` to `struct event`

Effectively a massive search and replace of
`struct thread` to `struct event`.  Using the
term `thread` gives people the thought that
this event system is a pthread when it is not

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

8 files changed, 52 insertions, 52 deletions

diff --git a/pathd/path_pcep_controller.c b/pathd/path_pcep_controller.c
index 405749b50..92ab5a63b 100644
--- a/pathd/path_pcep_controller.c
+++ b/pathd/path_pcep_controller.c
@@ -78,28 +78,28 @@ struct get_pcep_session_args {
 
 /* Internal Functions Called From Main Thread */
 static int pcep_ctrl_halt_cb(struct frr_pthread *fpt, void **res);
-static void pcep_refine_path_event_cb(struct thread *thread);
+static void pcep_refine_path_event_cb(struct event *thread);
 
 /* Internal Functions Called From Controller Thread */
-static void pcep_thread_finish_event_handler(struct thread *thread);
+static void pcep_thread_finish_event_handler(struct event *thread);
 
 /* Controller Thread Timer Handler */
 static int schedule_thread_timer(struct ctrl_state *ctrl_state, int pcc_id,
 				 enum pcep_ctrl_timer_type timer_type,
 				 enum pcep_ctrl_timeout_type timeout_type,
 				 uint32_t delay, void *payload,
-				 struct thread **thread);
+				 struct event **thread);
 static int schedule_thread_timer_with_cb(
 	struct ctrl_state *ctrl_state, int pcc_id,
 	enum pcep_ctrl_timer_type timer_type,
 	enum pcep_ctrl_timeout_type timeout_type, uint32_t delay, void *payload,
-	struct thread **thread, pcep_ctrl_thread_callback timer_cb);
-static void pcep_thread_timer_handler(struct thread *thread);
+	struct event **thread, pcep_ctrl_thread_callback timer_cb);
+static void pcep_thread_timer_handler(struct event *thread);
 
 /* Controller Thread Socket read/write Handler */
 static int schedule_thread_socket(struct ctrl_state *ctrl_state, int pcc_id,
 				  enum pcep_ctrl_socket_type type, bool is_read,
-				  void *payload, int fd, struct thread **thread,
+				  void *payload, int fd, struct event **thread,
 				  pcep_ctrl_thread_callback cb);
 
 /* Controller Thread Event Handler */
@@ -110,7 +110,7 @@ static int send_to_thread_with_cb(struct ctrl_state *ctrl_state, int pcc_id,
 				  enum pcep_ctrl_event_type type,
 				  uint32_t sub_type, void *payload,
 				  pcep_ctrl_thread_callback event_cb);
-static void pcep_thread_event_handler(struct thread *thread);
+static void pcep_thread_event_handler(struct event *thread);
 static int pcep_thread_event_update_pcc_options(struct ctrl_state *ctrl_state,
 						struct pcc_opts *opts);
 static int pcep_thread_event_update_pce_options(struct ctrl_state *ctrl_state,
@@ -135,7 +135,7 @@ pcep_thread_path_refined_event(struct ctrl_state *ctrl_state,
 /* Main Thread Event Handler */
 static int send_to_main(struct ctrl_state *ctrl_state, int pcc_id,
 			enum pcep_main_event_type type, void *payload);
-static void pcep_main_event_handler(struct thread *thread);
+static void pcep_main_event_handler(struct event *thread);
 
 /* Helper functions */
 static void set_ctrl_state(struct frr_pthread *fpt,
@@ -326,7 +326,7 @@ int pcep_ctrl_halt_cb(struct frr_pthread *fpt, void **res)
 	return 0;
 }
 
-void pcep_refine_path_event_cb(struct thread *thread)
+void pcep_refine_path_event_cb(struct event *thread)
 {
 	struct pcep_refine_path_event_data *data = THREAD_ARG(thread);
 	assert(data != NULL);
@@ -377,14 +377,14 @@ void pcep_thread_remove_candidate_path_segments(struct ctrl_state *ctrl_state,
 
 void pcep_thread_schedule_sync_best_pce(struct ctrl_state *ctrl_state,
 					int pcc_id, int delay,
-					struct thread **thread)
+					struct event **thread)
 {
 
 	schedule_thread_timer(ctrl_state, pcc_id, TM_CALCULATE_BEST_PCE,
 			      TO_UNDEFINED, delay, NULL, thread);
 }
 
-void pcep_thread_cancel_timer(struct thread **thread)
+void pcep_thread_cancel_timer(struct event **thread)
 {
 	if (thread == NULL || *thread == NULL) {
 		return;
@@ -405,7 +405,7 @@ void pcep_thread_cancel_timer(struct thread **thread)
 }
 
 void pcep_thread_schedule_reconnect(struct ctrl_state *ctrl_state, int pcc_id,
-				    int retry_count, struct thread **thread)
+				    int retry_count, struct event **thread)
 {
 	uint32_t delay = backoff_delay(MAX_RECONNECT_DELAY, 1, retry_count);
 	PCEP_DEBUG("Schedule RECONNECT_PCC for %us (retry %u)", delay,
@@ -417,7 +417,7 @@ void pcep_thread_schedule_reconnect(struct ctrl_state *ctrl_state, int pcc_id,
 void pcep_thread_schedule_timeout(struct ctrl_state *ctrl_state, int pcc_id,
 				  enum pcep_ctrl_timeout_type timeout_type,
 				  uint32_t delay, void *param,
-				  struct thread **thread)
+				  struct event **thread)
 {
 	assert(timeout_type > TO_UNDEFINED);
 	assert(timeout_type < TO_MAX);
@@ -429,7 +429,7 @@ void pcep_thread_schedule_timeout(struct ctrl_state *ctrl_state, int pcc_id,
 
 void pcep_thread_schedule_pceplib_timer(struct ctrl_state *ctrl_state,
 					int delay, void *payload,
-					struct thread **thread,
+					struct event **thread,
 					pcep_ctrl_thread_callback timer_cb)
 {
 	PCEP_DEBUG("Schedule PCEPLIB_TIMER for %us", delay);
@@ -440,7 +440,7 @@ void pcep_thread_schedule_pceplib_timer(struct ctrl_state *ctrl_state,
 
 void pcep_thread_schedule_session_timeout(struct ctrl_state *ctrl_state,
 					  int pcc_id, int delay,
-					  struct thread **thread)
+					  struct event **thread)
 {
 	PCEP_DEBUG("Schedule session_timeout interval for %us", delay);
 	schedule_thread_timer(ctrl_state, pcc_id, TM_SESSION_TIMEOUT_PCC,
@@ -493,7 +493,7 @@ void pcep_thread_path_refined_event(struct ctrl_state *ctrl_state,
 
 /* ------------ Internal Functions Called From Controller Thread ------------ */
 
-void pcep_thread_finish_event_handler(struct thread *thread)
+void pcep_thread_finish_event_handler(struct event *thread)
 {
 	int i;
 	struct frr_pthread *fpt = THREAD_ARG(thread);
@@ -521,7 +521,7 @@ int schedule_thread_timer_with_cb(struct ctrl_state *ctrl_state, int pcc_id,
 				  enum pcep_ctrl_timer_type timer_type,
 				  enum pcep_ctrl_timeout_type timeout_type,
 				  uint32_t delay, void *payload,
-				  struct thread **thread,
+				  struct event **thread,
 				  pcep_ctrl_thread_callback timer_cb)
 {
 	assert(thread != NULL);
@@ -544,14 +544,14 @@ int schedule_thread_timer_with_cb(struct ctrl_state *ctrl_state, int pcc_id,
 int schedule_thread_timer(struct ctrl_state *ctrl_state, int pcc_id,
 			  enum pcep_ctrl_timer_type timer_type,
 			  enum pcep_ctrl_timeout_type timeout_type,
-			  uint32_t delay, void *payload, struct thread **thread)
+			  uint32_t delay, void *payload, struct event **thread)
 {
 	return schedule_thread_timer_with_cb(ctrl_state, pcc_id, timer_type,
 					     timeout_type, delay, payload,
 					     thread, pcep_thread_timer_handler);
 }
 
-void pcep_thread_timer_handler(struct thread *thread)
+void pcep_thread_timer_handler(struct event *thread)
 {
 	/* data unpacking */
 	struct pcep_ctrl_timer_data *data = THREAD_ARG(thread);
@@ -598,7 +598,7 @@ void pcep_thread_timer_handler(struct thread *thread)
 	}
 }
 
-void pcep_thread_pcep_event(struct thread *thread)
+void pcep_thread_pcep_event(struct event *thread)
 {
 	struct pcep_ctrl_event_data *data = THREAD_ARG(thread);
 	assert(data != NULL);
@@ -624,7 +624,7 @@ void pcep_thread_pcep_event(struct thread *thread)
 
 int schedule_thread_socket(struct ctrl_state *ctrl_state, int pcc_id,
 			   enum pcep_ctrl_socket_type type, bool is_read,
-			   void *payload, int fd, struct thread **thread,
+			   void *payload, int fd, struct event **thread,
 			   pcep_ctrl_thread_callback socket_cb)
 {
 	assert(thread != NULL);
@@ -656,7 +656,7 @@ int pcep_thread_socket_write(void *fpt, void **thread, int fd, void *payload,
 	struct ctrl_state *ctrl_state = ((struct frr_pthread *)fpt)->data;
 
 	return schedule_thread_socket(ctrl_state, 0, SOCK_PCEPLIB, false,
-				      payload, fd, (struct thread **)thread,
+				      payload, fd, (struct event **)thread,
 				      socket_cb);
 }
 
@@ -666,7 +666,7 @@ int pcep_thread_socket_read(void *fpt, void **thread, int fd, void *payload,
 	struct ctrl_state *ctrl_state = ((struct frr_pthread *)fpt)->data;
 
 	return schedule_thread_socket(ctrl_state, 0, SOCK_PCEPLIB, true,
-				      payload, fd, (struct thread **)thread,
+				      payload, fd, (struct event **)thread,
 				      socket_cb);
 }
 
@@ -707,7 +707,7 @@ int send_to_thread_with_cb(struct ctrl_state *ctrl_state, int pcc_id,
 	return 0;
 }
 
-void pcep_thread_event_handler(struct thread *thread)
+void pcep_thread_event_handler(struct event *thread)
 {
 	/* data unpacking */
 	struct pcep_ctrl_event_data *data = THREAD_ARG(thread);
@@ -969,7 +969,7 @@ int send_to_main(struct ctrl_state *ctrl_state, int pcc_id,
 	return 0;
 }
 
-void pcep_main_event_handler(struct thread *thread)
+void pcep_main_event_handler(struct event *thread)
 {
 	/* data unpacking */
 	struct pcep_main_event_data *data = THREAD_ARG(thread);
diff --git a/pathd/path_pcep_controller.h b/pathd/path_pcep_controller.h
index c2359beb2..200a5db99 100644
--- a/pathd/path_pcep_controller.h
+++ b/pathd/path_pcep_controller.h
@@ -77,7 +77,7 @@ struct pcep_ctrl_socket_data {
 	void *payload;
 };
 
-typedef void (*pcep_ctrl_thread_callback)(struct thread *);
+typedef void (*pcep_ctrl_thread_callback)(struct event *);
 
 /* PCC connection information, populated in a thread-safe
  * manner with pcep_ctrl_get_pcc_info() */
@@ -134,25 +134,25 @@ void pcep_thread_update_path(struct ctrl_state *ctrl_state, int pcc_id,
 			     struct path *path);
 void pcep_thread_initiate_path(struct ctrl_state *ctrl_state, int pcc_id,
 			       struct path *path);
-void pcep_thread_cancel_timer(struct thread **thread);
+void pcep_thread_cancel_timer(struct event **thread);
 void pcep_thread_schedule_reconnect(struct ctrl_state *ctrl_state, int pcc_id,
-				    int retry_count, struct thread **thread);
+				    int retry_count, struct event **thread);
 void pcep_thread_schedule_timeout(struct ctrl_state *ctrl_state, int pcc_id,
 				  enum pcep_ctrl_timeout_type type,
 				  uint32_t delay, void *param,
-				  struct thread **thread);
+				  struct event **thread);
 void pcep_thread_schedule_session_timeout(struct ctrl_state *ctrl_state,
 					  int pcc_id, int delay,
-					  struct thread **thread);
+					  struct event **thread);
 void pcep_thread_remove_candidate_path_segments(struct ctrl_state *ctrl_state,
 						struct pcc_state *pcc_state);
 
 void pcep_thread_schedule_sync_best_pce(struct ctrl_state *ctrl_state,
 					int pcc_id, int delay,
-					struct thread **thread);
+					struct event **thread);
 void pcep_thread_schedule_pceplib_timer(struct ctrl_state *ctrl_state,
 					int delay, void *payload,
-					struct thread **thread,
+					struct event **thread,
 					pcep_ctrl_thread_callback cb);
 int pcep_thread_socket_read(void *fpt, void **thread, int fd, void *payload,
 			    pcep_ctrl_thread_callback cb);
@@ -161,7 +161,7 @@ int pcep_thread_socket_write(void *fpt, void **thread, int fd, void *payload,
 
 int pcep_thread_send_ctrl_event(void *fpt, void *payload,
 				pcep_ctrl_thread_callback cb);
-void pcep_thread_pcep_event(struct thread *thread);
+void pcep_thread_pcep_event(struct event *thread);
 int pcep_thread_pcc_count(struct ctrl_state *ctrl_state);
 /* Called by the PCC to refine a path in the main thread */
 int pcep_thread_refine_path(struct ctrl_state *ctrl_state, int pcc_id,
diff --git a/pathd/path_pcep_lib.c b/pathd/path_pcep_lib.c
index 502f2336c..dcf4921d7 100644
--- a/pathd/path_pcep_lib.c
+++ b/pathd/path_pcep_lib.c
@@ -33,8 +33,8 @@ static int pcep_lib_pceplib_socket_read_cb(void *fpt, void **thread, int fd,
 					   void *payload);
 static int pcep_lib_pceplib_socket_write_cb(void *fpt, void **thread, int fd,
 					    void *payload);
-static void pcep_lib_socket_read_ready(struct thread *thread);
-static void pcep_lib_socket_write_ready(struct thread *thread);
+static void pcep_lib_socket_read_ready(struct event *thread);
+static void pcep_lib_socket_write_ready(struct event *thread);
 
 /* pceplib pcep_event callbacks */
 static void pcep_lib_pceplib_event_cb(void *fpt, pcep_event *event);
@@ -229,7 +229,7 @@ int pcep_lib_pceplib_socket_read_cb(void *fpt, void **thread, int fd,
 /* Callbacks called by path_pcep_controller when a socket is ready to read/write
  */
 
-void pcep_lib_socket_write_ready(struct thread *thread)
+void pcep_lib_socket_write_ready(struct event *thread)
 {
 	struct pcep_ctrl_socket_data *data = THREAD_ARG(thread);
 	assert(data != NULL);
@@ -238,7 +238,7 @@ void pcep_lib_socket_write_ready(struct thread *thread)
 	XFREE(MTYPE_PCEP, data);
 }
 
-void pcep_lib_socket_read_ready(struct thread *thread)
+void pcep_lib_socket_read_ready(struct event *thread)
 {
 	struct pcep_ctrl_socket_data *data = THREAD_ARG(thread);
 	assert(data != NULL);
diff --git a/pathd/path_pcep_pcc.h b/pathd/path_pcep_pcc.h
index 039d67d2e..f3d0f290a 100644
--- a/pathd/path_pcep_pcc.h
+++ b/pathd/path_pcep_pcc.h
@@ -41,7 +41,7 @@ struct req_map_data {
 
 struct req_entry {
 	RB_ENTRY(req_entry) entry;
-	struct thread *t_retry;
+	struct event *t_retry;
 	int retry_count;
 	bool was_sent;
 	struct path *path;
@@ -66,9 +66,9 @@ struct pcc_state {
 	pcep_session *sess;
 	uint32_t retry_count;
 	bool synchronized;
-	struct thread *t_reconnect;
-	struct thread *t_update_best;
-	struct thread *t_session_timeout;
+	struct event *t_reconnect;
+	struct event *t_update_best;
+	struct event *t_session_timeout;
 	uint32_t next_reqid;
 	uint32_t next_plspid;
 	struct plspid_map_head plspid_map;
diff --git a/pathd/path_ted.c b/pathd/path_ted.c
index bc0da969e..d39371041 100644
--- a/pathd/path_ted.c
+++ b/pathd/path_ted.c
@@ -28,8 +28,8 @@ static void path_ted_unregister_vty(void);
 static uint32_t path_ted_start_importing_igp(const char *daemon_str);
 static uint32_t path_ted_stop_importing_igp(void);
 static enum zclient_send_status path_ted_link_state_sync(void);
-static void path_ted_timer_handler_sync(struct thread *thread);
-static void path_ted_timer_handler_refresh(struct thread *thread);
+static void path_ted_timer_handler_sync(struct event *thread);
+static void path_ted_timer_handler_refresh(struct event *thread);
 static int path_ted_cli_debug_config_write(struct vty *vty);
 static int path_ted_cli_debug_set_all(uint32_t flags, bool set);
 
@@ -597,7 +597,7 @@ enum zclient_send_status path_ted_link_state_sync(void)
  *
  * @return		status
  */
-void path_ted_timer_handler_sync(struct thread *thread)
+void path_ted_timer_handler_sync(struct event *thread)
 {
 	/* data unpacking */
 	struct ted_state *data = THREAD_ARG(thread);
@@ -634,7 +634,7 @@ int path_ted_segment_list_refresh(void)
  *
  * @return		status
  */
-void path_ted_timer_handler_refresh(struct thread *thread)
+void path_ted_timer_handler_refresh(struct event *thread)
 {
 	if (!path_ted_is_initialized())
 		return;
diff --git a/pathd/path_ted.h b/pathd/path_ted.h
index 10cdd545f..e4f362f26 100644
--- a/pathd/path_ted.h
+++ b/pathd/path_ted.h
@@ -49,9 +49,9 @@ struct ted_state {
 	/* The TED itself as in link_state.h */
 	struct ls_ted *ted;
 	/* Timer for ted sync */
-	struct thread *t_link_state_sync;
+	struct event *t_link_state_sync;
 	/* Timer for refresh sid in segment list */
-	struct thread *t_segment_list_refresh;
+	struct event *t_segment_list_refresh;
 	/* delay interval in seconds */
 	uint32_t link_state_delay_interval;
 	/* delay interval refresh in seconds */
diff --git a/pathd/pathd.c b/pathd/pathd.c
index 86501f7ad..b11d90905 100644
--- a/pathd/pathd.c
+++ b/pathd/pathd.c
@@ -45,9 +45,9 @@ struct debug path_policy_debug;
 
 
 static void trigger_pathd_candidate_created(struct srte_candidate *candidate);
-static void trigger_pathd_candidate_created_timer(struct thread *thread);
+static void trigger_pathd_candidate_created_timer(struct event *thread);
 static void trigger_pathd_candidate_updated(struct srte_candidate *candidate);
-static void trigger_pathd_candidate_updated_timer(struct thread *thread);
+static void trigger_pathd_candidate_updated_timer(struct event *thread);
 static void trigger_pathd_candidate_removed(struct srte_candidate *candidate);
 static const char *
 srte_candidate_metric_name(enum srte_candidate_metric_type type);
@@ -1297,7 +1297,7 @@ void trigger_pathd_candidate_created(struct srte_candidate *candidate)
 			 (void *)candidate, HOOK_DELAY, &candidate->hook_timer);
 }
 
-void trigger_pathd_candidate_created_timer(struct thread *thread)
+void trigger_pathd_candidate_created_timer(struct event *thread)
 {
 	struct srte_candidate *candidate = THREAD_ARG(thread);
 	candidate->hook_timer = NULL;
@@ -1317,7 +1317,7 @@ void trigger_pathd_candidate_updated(struct srte_candidate *candidate)
 			 (void *)candidate, HOOK_DELAY, &candidate->hook_timer);
 }
 
-void trigger_pathd_candidate_updated_timer(struct thread *thread)
+void trigger_pathd_candidate_updated_timer(struct event *thread)
 {
 	struct srte_candidate *candidate = THREAD_ARG(thread);
 	candidate->hook_timer = NULL;
diff --git a/pathd/pathd.h b/pathd/pathd.h
index f1a59b116..1af5d877a 100644
--- a/pathd/pathd.h
+++ b/pathd/pathd.h
@@ -311,7 +311,7 @@ struct srte_candidate {
 	uint32_t affinity_filters[MAX_AFFINITY_FILTER_TYPE];
 
 	/* Hooks delaying timer */
-	struct thread *hook_timer;
+	struct event *hook_timer;
 };
 
 RB_HEAD(srte_candidate_head, srte_candidate);