*: Convert struct thread_master to struct event_master and it's ilk

Convert the `struct thread_master` to `struct event_master`
across the code base.

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

10 files changed, 15 insertions, 15 deletions

diff --git a/pathd/path_main.c b/pathd/path_main.c
index 7d54123d7f..92fd0bfd3d 100644
--- a/pathd/path_main.c
+++ b/pathd/path_main.c
@@ -41,7 +41,7 @@ struct zebra_privs_t pathd_privs = {
 struct option longopts[] = {{0}};
 
 /* Master of threads. */
-struct thread_master *master;
+struct event_master *master;
 
 static struct frr_daemon_info pathd_di;
 
diff --git a/pathd/path_pcep.c b/pathd/path_pcep.c
index 0c5e495044..243879f634 100644
--- a/pathd/path_pcep.c
+++ b/pathd/path_pcep.c
@@ -58,7 +58,7 @@ static void notify_status(struct path *path, bool not_changed);
 
 /* Module Functions */
 static int pcep_module_finish(void);
-static int pcep_module_late_init(struct thread_master *tm);
+static int pcep_module_late_init(struct event_master *tm);
 static int pcep_module_init(void);
 
 /* ------------ Path Helper Functions ------------ */
@@ -310,7 +310,7 @@ int pathd_candidate_removed_handler(struct srte_candidate *candidate)
  * run before config load, so the CLI commands don't try to touch things that
  * aren't set up yet...
  */
-static int pcep_module_config_pre(struct thread_master *tm)
+static int pcep_module_config_pre(struct event_master *tm)
 {
 	assert(pcep_g->fpt == NULL);
 	assert(pcep_g->master == NULL);
@@ -329,7 +329,7 @@ static int pcep_module_config_pre(struct thread_master *tm)
 	return 0;
 }
 
-static int pcep_module_late_init(struct thread_master *tm)
+static int pcep_module_late_init(struct event_master *tm)
 {
 	hook_register(pathd_candidate_created, pathd_candidate_created_handler);
 	hook_register(pathd_candidate_updated, pathd_candidate_updated_handler);
diff --git a/pathd/path_pcep.h b/pathd/path_pcep.h
index 6f92d76362..ef2edbacf0 100644
--- a/pathd/path_pcep.h
+++ b/pathd/path_pcep.h
@@ -294,7 +294,7 @@ struct path {
 
 struct pcep_glob {
 	struct debug dbg;
-	struct thread_master *master;
+	struct event_master *master;
 	struct frr_pthread *fpt;
 	uint8_t num_pce_opts_cli;
 	struct pce_opts_cli *pce_opts_cli[MAX_PCE];
diff --git a/pathd/path_pcep_controller.c b/pathd/path_pcep_controller.c
index 53963c50bc..4f03dbde27 100644
--- a/pathd/path_pcep_controller.c
+++ b/pathd/path_pcep_controller.c
@@ -152,7 +152,7 @@ static const char *timeout_type_name(enum pcep_ctrl_timeout_type type);
 
 /* ------------ API Functions Called from Main Thread ------------ */
 
-int pcep_ctrl_initialize(struct thread_master *main_thread,
+int pcep_ctrl_initialize(struct event_master *main_thread,
 			 struct frr_pthread **fpt,
 			 pcep_main_event_handler_t event_handler)
 {
diff --git a/pathd/path_pcep_controller.h b/pathd/path_pcep_controller.h
index 200a5db994..d1cf0a2a1d 100644
--- a/pathd/path_pcep_controller.h
+++ b/pathd/path_pcep_controller.h
@@ -33,8 +33,8 @@ enum pcep_pathd_event_type {
 };
 
 struct ctrl_state {
-	struct thread_master *main;
-	struct thread_master *self;
+	struct event_master *main;
+	struct event_master *self;
 	pcep_main_event_handler_t main_event_handler;
 	struct pcc_opts *pcc_opts;
 	int pcc_count;
@@ -97,7 +97,7 @@ struct pcep_pcc_info {
 };
 
 /* Functions called from the main thread */
-int pcep_ctrl_initialize(struct thread_master *main_thread,
+int pcep_ctrl_initialize(struct event_master *main_thread,
 			 struct frr_pthread **fpt,
 			 pcep_main_event_handler_t event_handler);
 int pcep_ctrl_finalize(struct frr_pthread **fpt);
diff --git a/pathd/path_ted.c b/pathd/path_ted.c
index 91033360cc..c13b0188f2 100644
--- a/pathd/path_ted.c
+++ b/pathd/path_ted.c
@@ -41,7 +41,7 @@ struct ted_state ted_state_g = {};
  * path_path_ted public API function implementations
  */
 
-void path_ted_init(struct thread_master *master)
+void path_ted_init(struct event_master *master)
 {
 	ted_state_g.main = master;
 	ted_state_g.link_state_delay_interval = TIMER_RETRY_DELAY;
diff --git a/pathd/path_ted.h b/pathd/path_ted.h
index e4f362f26d..735976f7f4 100644
--- a/pathd/path_ted.h
+++ b/pathd/path_ted.h
@@ -41,7 +41,7 @@ enum igp_import {
 	IMPORT_OSPFv3
 };
 struct ted_state {
-	struct thread_master *main;
+	struct event_master *main;
 	/* Status of TED: enable or disable */
 	bool enabled;
 	/* From which igp is going to receive data */
@@ -84,7 +84,7 @@ struct ted_state {
 
 /* TED management functions */
 bool path_ted_is_initialized(void);
-void path_ted_init(struct thread_master *master);
+void path_ted_init(struct event_master *master);
 uint32_t path_ted_teardown(void);
 void path_ted_timer_sync_cancel(void);
 void path_ted_timer_refresh_cancel(void);
diff --git a/pathd/path_zebra.c b/pathd/path_zebra.c
index 28daac60bd..dcaf0eba18 100644
--- a/pathd/path_zebra.c
+++ b/pathd/path_zebra.c
@@ -318,7 +318,7 @@ static zclient_handler *const path_handlers[] = {
  *
  * @param master The master thread
  */
-void path_zebra_init(struct thread_master *master)
+void path_zebra_init(struct event_master *master)
 {
 	struct zclient_options options = zclient_options_default;
 	options.synchronous = true;
diff --git a/pathd/path_zebra.h b/pathd/path_zebra.h
index 0d435bb519..44369526d2 100644
--- a/pathd/path_zebra.h
+++ b/pathd/path_zebra.h
@@ -16,7 +16,7 @@ void path_zebra_add_sr_policy(struct srte_policy *policy,
 void path_zebra_delete_sr_policy(struct srte_policy *policy);
 int path_zebra_request_label(mpls_label_t label);
 void path_zebra_release_label(mpls_label_t label);
-void path_zebra_init(struct thread_master *master);
+void path_zebra_init(struct event_master *master);
 void path_zebra_stop(void);
 
 #endif /* _FRR_PATH_MPLS_H_ */
diff --git a/pathd/pathd.h b/pathd/pathd.h
index 1af5d877a4..92d07ef261 100644
--- a/pathd/pathd.h
+++ b/pathd/pathd.h
@@ -371,7 +371,7 @@ extern struct srte_policy_head srte_policies;
 extern struct zebra_privs_t pathd_privs;
 
 /* master thread, defined in path_main.c */
-extern struct thread_master *master;
+extern struct event_master *master;
 
 /* pathd.c */
 struct srte_segment_list *srte_segment_list_add(const char *name);