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

22 files changed, 23 insertions, 23 deletions

diff --git a/tests/lib/cli/common_cli.c b/tests/lib/cli/common_cli.c
index 0a98748ed..843baa1f6 100644
--- a/tests/lib/cli/common_cli.c
+++ b/tests/lib/cli/common_cli.c
@@ -17,7 +17,7 @@
 
 #include "common_cli.h"
 
-struct thread_master *master;
+struct event_master *master;
 
 int dump_args(struct vty *vty, const char *descr, int argc,
 	      struct cmd_token *argv[])
diff --git a/tests/lib/cli/common_cli.h b/tests/lib/cli/common_cli.h
index 7ef4d860b..697074355 100644
--- a/tests/lib/cli/common_cli.h
+++ b/tests/lib/cli/common_cli.h
@@ -22,7 +22,7 @@ extern void test_init(int argc, char **argv);
 /* functions provided by common cli
  * (includes main())
  */
-extern struct thread_master *master;
+extern struct event_master *master;
 
 extern int test_log_prio;
 
diff --git a/tests/lib/cli/test_commands.c b/tests/lib/cli/test_commands.c
index 54db79575..9f788ae18 100644
--- a/tests/lib/cli/test_commands.c
+++ b/tests/lib/cli/test_commands.c
@@ -30,7 +30,7 @@ extern vector cmdvec;
 extern struct cmd_node vty_node;
 extern void test_init_cmd(void); /* provided in test-commands-defun.c */
 
-struct thread_master *master; /* dummy for libfrr*/
+struct event_master *master; /* dummy for libfrr*/
 
 static vector test_cmds;
 static char test_buf[32768];
diff --git a/tests/lib/northbound/test_oper_data.c b/tests/lib/northbound/test_oper_data.c
index 08860c110..7329cf1af 100644
--- a/tests/lib/northbound/test_oper_data.c
+++ b/tests/lib/northbound/test_oper_data.c
@@ -14,7 +14,7 @@
 #include "log.h"
 #include "northbound.h"
 
-static struct thread_master *master;
+static struct event_master *master;
 
 struct troute {
 	struct prefix_ipv4 prefix;
diff --git a/tests/lib/test_assert.c b/tests/lib/test_assert.c
index 13f8daa5f..356be12c1 100644
--- a/tests/lib/test_assert.c
+++ b/tests/lib/test_assert.c
@@ -28,7 +28,7 @@ static void func_for_bt(int number)
 int main(int argc, char **argv)
 {
 	int number = 10;
-	struct thread_master *master;
+	struct event_master *master;
 
 	zlog_aux_init("NONE: ", LOG_DEBUG);
 
diff --git a/tests/lib/test_buffer.c b/tests/lib/test_buffer.c
index 9f501f4e3..4d6fb0d15 100644
--- a/tests/lib/test_buffer.c
+++ b/tests/lib/test_buffer.c
@@ -8,7 +8,7 @@
 #include <lib_vty.h>
 #include <buffer.h>
 
-struct thread_master *master;
+struct event_master *master;
 
 int main(int argc, char **argv)
 {
diff --git a/tests/lib/test_checksum.c b/tests/lib/test_checksum.c
index fcb79ee28..ff787f93a 100644
--- a/tests/lib/test_checksum.c
+++ b/tests/lib/test_checksum.c
@@ -11,7 +11,7 @@
 #include "network.h"
 #include "prng.h"
 
-struct thread_master *master;
+struct event_master *master;
 
 struct acc_vals {
 	int c0;
diff --git a/tests/lib/test_grpc.cpp b/tests/lib/test_grpc.cpp
index c09bdd05d..3bfe98a66 100644
--- a/tests/lib/test_grpc.cpp
+++ b/tests/lib/test_grpc.cpp
@@ -34,13 +34,13 @@
 #include <grpcpp/security/credentials.h>
 #include "grpc/frr-northbound.grpc.pb.h"
 
-DEFINE_HOOK(frr_late_init, (struct thread_master * tm), (tm));
+DEFINE_HOOK(frr_late_init, (struct event_master * tm), (tm));
 DEFINE_KOOH(frr_fini, (), ());
 
 struct vty *vty;
 
 bool mpls_enabled;
-struct thread_master *master;
+struct event_master *master;
 struct zebra_privs_t static_privs = {0};
 struct frrmod_runtime *grpc_module;
 char binpath[2 * MAXPATHLEN + 1];
diff --git a/tests/lib/test_heavy_thread.c b/tests/lib/test_heavy_thread.c
index fd8e910fd..bd5ecf37c 100644
--- a/tests/lib/test_heavy_thread.c
+++ b/tests/lib/test_heavy_thread.c
@@ -22,7 +22,7 @@
 
 #include "tests.h"
 
-extern struct thread_master *master;
+extern struct event_master *master;
 
 enum { ITERS_FIRST = 0,
        ITERS_ERR = 100,
diff --git a/tests/lib/test_heavy_wq.c b/tests/lib/test_heavy_wq.c
index e09c4885c..93aafe83f 100644
--- a/tests/lib/test_heavy_wq.c
+++ b/tests/lib/test_heavy_wq.c
@@ -27,7 +27,7 @@ DEFINE_MGROUP(TEST_HEAVYWQ, "heavy-wq test");
 DEFINE_MTYPE_STATIC(TEST_HEAVYWQ, WQ_NODE, "heavy_wq_node");
 DEFINE_MTYPE_STATIC(TEST_HEAVYWQ, WQ_NODE_STR, "heavy_wq_node->str");
 
-extern struct thread_master *master;
+extern struct event_master *master;
 static struct work_queue *heavy_wq;
 
 struct heavy_wq_node {
diff --git a/tests/lib/test_memory.c b/tests/lib/test_memory.c
index e4423b0b5..a77ee3d22 100644
--- a/tests/lib/test_memory.c
+++ b/tests/lib/test_memory.c
@@ -15,7 +15,7 @@ DEFINE_MTYPE_STATIC(TEST_MEMORY, TEST, "generic test mtype");
  * CVS
  */
 
-struct thread_master *master;
+struct event_master *master;
 
 #if 0 /* set to 1 to use system alloc directly */
 #undef XMALLOC
diff --git a/tests/lib/test_nexthop_iter.c b/tests/lib/test_nexthop_iter.c
index 2bb0b1233..1cff00d4b 100644
--- a/tests/lib/test_nexthop_iter.c
+++ b/tests/lib/test_nexthop_iter.c
@@ -13,7 +13,7 @@
 #include "zebra/rib.h"
 #include "prng.h"
 
-struct thread_master *master;
+struct event_master *master;
 static int verbose;
 
 static void str_append(char **buf, const char *repr)
diff --git a/tests/lib/test_privs.c b/tests/lib/test_privs.c
index d7bc0b315..13b1c194e 100644
--- a/tests/lib/test_privs.c
+++ b/tests/lib/test_privs.c
@@ -50,7 +50,7 @@ Report bugs to %s\n",
 	exit(status);
 }
 
-struct thread_master *master;
+struct event_master *master;
 /* main routine. */
 int main(int argc, char **argv)
 {
diff --git a/tests/lib/test_resolver.c b/tests/lib/test_resolver.c
index b4d8992b9..5eb99b2ad 100644
--- a/tests/lib/test_resolver.c
+++ b/tests/lib/test_resolver.c
@@ -26,7 +26,7 @@
 
 #include "tests/lib/cli/common_cli.h"
 
-extern struct thread_master *master;
+extern struct event_master *master;
 
 static void resolver_result(struct resolver_query *resq, const char *errstr,
 			    int numaddrs, union sockunion *addr)
diff --git a/tests/lib/test_segv.c b/tests/lib/test_segv.c
index 3cf4cbad2..91c29c5ad 100644
--- a/tests/lib/test_segv.c
+++ b/tests/lib/test_segv.c
@@ -17,7 +17,7 @@
 
 struct frr_signal_t sigs[] = {};
 
-struct thread_master *master;
+struct event_master *master;
 
 void func1(int *arg);
 void func3(void);
diff --git a/tests/lib/test_sig.c b/tests/lib/test_sig.c
index d568bb547..28101a241 100644
--- a/tests/lib/test_sig.c
+++ b/tests/lib/test_sig.c
@@ -35,7 +35,7 @@ struct frr_signal_t sigs[] = {{
 				      .handler = &sigusr2,
 			      }};
 
-struct thread_master *master;
+struct event_master *master;
 struct event t;
 
 int main(void)
diff --git a/tests/lib/test_srcdest_table.c b/tests/lib/test_srcdest_table.c
index c1235fe85..a93a968db 100644
--- a/tests/lib/test_srcdest_table.c
+++ b/tests/lib/test_srcdest_table.c
@@ -24,7 +24,7 @@
 #define s6_addr32 __u6_addr.__u6_addr32
 #endif /*s6_addr32*/
 
-struct thread_master *master;
+struct event_master *master;
 
 /* This structure is copied from lib/srcdest_table.c to which it is
  * private as far as other parts of Quagga are concerned.
diff --git a/tests/lib/test_stream.c b/tests/lib/test_stream.c
index 8bf6f7fcc..319afd9cf 100644
--- a/tests/lib/test_stream.c
+++ b/tests/lib/test_stream.c
@@ -11,7 +11,7 @@
 #include "printfrr.h"
 
 static unsigned long long ham = 0xdeadbeefdeadbeef;
-struct thread_master *master;
+struct event_master *master;
 
 static void print_stream(struct stream *s)
 {
diff --git a/tests/lib/test_table.c b/tests/lib/test_table.c
index 41d700395..2ae1fe82a 100644
--- a/tests/lib/test_table.c
+++ b/tests/lib/test_table.c
@@ -25,7 +25,7 @@ typedef struct test_node_t_ {
 	char *prefix_str;
 } test_node_t;
 
-struct thread_master *master;
+struct event_master *master;
 
 /*
  * add_node
diff --git a/tests/lib/test_timer_correctness.c b/tests/lib/test_timer_correctness.c
index 054254f4a..ae5ec1dc7 100644
--- a/tests/lib/test_timer_correctness.c
+++ b/tests/lib/test_timer_correctness.c
@@ -23,7 +23,7 @@
 
 #define TIMESTR_LEN strlen("4294967296.999999")
 
-struct thread_master *master;
+struct event_master *master;
 
 static size_t log_buf_len;
 static size_t log_buf_pos;
diff --git a/tests/lib/test_timer_performance.c b/tests/lib/test_timer_performance.c
index c5ac1fa83..017d90334 100644
--- a/tests/lib/test_timer_performance.c
+++ b/tests/lib/test_timer_performance.c
@@ -20,7 +20,7 @@
 #define SCHEDULE_TIMERS 1000000
 #define REMOVE_TIMERS    500000
 
-struct thread_master *master;
+struct event_master *master;
 
 static void dummy_func(struct event *thread)
 {
diff --git a/tests/lib/test_zmq.c b/tests/lib/test_zmq.c
index 6869870f1..bb6a29e68 100644
--- a/tests/lib/test_zmq.c
+++ b/tests/lib/test_zmq.c
@@ -12,7 +12,7 @@
 DEFINE_MTYPE_STATIC(LIB, TESTBUF, "zmq test buffer");
 DEFINE_MTYPE_STATIC(LIB, ZMQMSG, "zmq message");
 
-static struct thread_master *master;
+static struct event_master *master;
 
 static void msg_buf_free(void *data, void *hint)
 {