*: 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>

8 files changed, 11 insertions, 11 deletions

diff --git a/isisd/isis_bfd.c b/isisd/isis_bfd.c
index b973dd493..cdd84f24b 100644
--- a/isisd/isis_bfd.c
+++ b/isisd/isis_bfd.c
@@ -209,7 +209,7 @@ static int bfd_handle_circuit_add_addr(struct isis_circuit *circuit)
 	return 0;
 }
 
-void isis_bfd_init(struct thread_master *tm)
+void isis_bfd_init(struct event_master *tm)
 {
 	bfd_protocol_integration_init(zclient, tm);
 
diff --git a/isisd/isis_bfd.h b/isisd/isis_bfd.h
index 30248ccec..946b3c7b7 100644
--- a/isisd/isis_bfd.h
+++ b/isisd/isis_bfd.h
@@ -7,10 +7,10 @@
 #define ISIS_BFD_H
 
 struct isis_circuit;
-struct thread_master;
+struct event_master;
 
 void isis_bfd_circuit_cmd(struct isis_circuit *circuit);
-void isis_bfd_init(struct thread_master *tm);
+void isis_bfd_init(struct event_master *tm);
 
 #endif
 
diff --git a/isisd/isis_main.c b/isisd/isis_main.c
index 04056636a..7b5d47235 100644
--- a/isisd/isis_main.c
+++ b/isisd/isis_main.c
@@ -77,7 +77,7 @@ static const struct option longopts[] = {
 	{0}};
 
 /* Master of threads. */
-struct thread_master *master;
+struct event_master *master;
 
 /*
  * Prototypes.
diff --git a/isisd/isis_snmp.c b/isisd/isis_snmp.c
index e0bcb180b..595bf4bdb 100644
--- a/isisd/isis_snmp.c
+++ b/isisd/isis_snmp.c
@@ -2797,7 +2797,7 @@ static uint8_t *isis_snmp_find_isadj_prot_supp(struct variable *v, oid *name,
 
 
 /* Register ISIS-MIB. */
-static int isis_snmp_init(struct thread_master *tm)
+static int isis_snmp_init(struct event_master *tm)
 {
 	struct isis_func_to_prefix *h2f = isis_func_to_prefix_arr;
 	struct variable *v;
diff --git a/isisd/isis_zebra.c b/isisd/isis_zebra.c
index c344f1634..2144b54a1 100644
--- a/isisd/isis_zebra.c
+++ b/isisd/isis_zebra.c
@@ -828,7 +828,7 @@ static zclient_handler *const isis_handlers[] = {
 	[ZEBRA_CLIENT_CLOSE_NOTIFY] = isis_zebra_client_close_notify,
 };
 
-void isis_zebra_init(struct thread_master *master, int instance)
+void isis_zebra_init(struct event_master *master, int instance)
 {
 	/* Initialize asynchronous zclient. */
 	zclient = zclient_new(master, &zclient_options_default, isis_handlers,
diff --git a/isisd/isis_zebra.h b/isisd/isis_zebra.h
index f34088f98..ab2f7244a 100644
--- a/isisd/isis_zebra.h
+++ b/isisd/isis_zebra.h
@@ -20,7 +20,7 @@ struct label_chunk {
 };
 #define CHUNK_SIZE 64
 
-void isis_zebra_init(struct thread_master *master, int instance);
+void isis_zebra_init(struct event_master *master, int instance);
 void isis_zebra_stop(void);
 
 struct isis_route_info;
diff --git a/isisd/isisd.c b/isisd/isisd.c
index 14641f67c..267c31670 100644
--- a/isisd/isisd.c
+++ b/isisd/isisd.c
@@ -166,7 +166,7 @@ struct isis *isis_lookup_by_sysid(const uint8_t *sysid)
 	return NULL;
 }
 
-void isis_master_init(struct thread_master *master)
+void isis_master_init(struct event_master *master)
 {
 	memset(&isis_master, 0, sizeof(isis_master));
 	im = &isis_master;
diff --git a/isisd/isisd.h b/isisd/isisd.h
index b86759af9..d33c4108b 100644
--- a/isisd/isisd.h
+++ b/isisd/isisd.h
@@ -71,7 +71,7 @@ struct isis_master {
 	/* ISIS instance. */
 	struct list *isis;
 	/* ISIS thread master. */
-	struct thread_master *master;
+	struct event_master *master;
 	uint8_t options;
 };
 #define F_ISIS_UNIT_TEST 0x01
@@ -252,7 +252,7 @@ DECLARE_MTYPE(ISIS_PLIST_NAME);
 DECLARE_HOOK(isis_area_overload_bit_update, (struct isis_area * area), (area));
 
 void isis_terminate(void);
-void isis_master_init(struct thread_master *master);
+void isis_master_init(struct event_master *master);
 void isis_vrf_link(struct isis *isis, struct vrf *vrf);
 void isis_vrf_unlink(struct isis *isis, struct vrf *vrf);
 struct isis *isis_lookup_by_vrfid(vrf_id_t vrf_id);
@@ -329,7 +329,7 @@ void config_end_lsp_generate(struct isis_area *area);
 #define ISIS_SR		"/frr-isisd:isis/instance/segment-routing"
 
 /* Master of threads. */
-extern struct thread_master *master;
+extern struct event_master *master;
 
 extern unsigned long debug_adj_pkt;
 extern unsigned long debug_snp_pkt;