*: Convert thread_master_XXX functions to event_master_XXX

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

10 files changed, 16 insertions, 16 deletions

diff --git a/tests/lib/cli/common_cli.c b/tests/lib/cli/common_cli.c
index 843baa1f6..bc3a4b534 100644
--- a/tests/lib/cli/common_cli.c
+++ b/tests/lib/cli/common_cli.c
@@ -39,7 +39,7 @@ static void vty_do_exit(int isexit)
 	vty_terminate();
 	nb_terminate();
 	yang_terminate();
-	thread_master_free(master);
+	event_master_free(master);
 
 	log_memstats(stderr, "testcli");
 	if (!isexit)
@@ -59,7 +59,7 @@ int main(int argc, char **argv)
 	umask(0027);
 
 	/* master init. */
-	master = thread_master_create(NULL);
+	master = event_master_create(NULL);
 
 	zlog_aux_init("NONE: ", test_log_prio);
 
diff --git a/tests/lib/fuzz_zlog.c b/tests/lib/fuzz_zlog.c
index ad9677a71..d308f8eb2 100644
--- a/tests/lib/fuzz_zlog.c
+++ b/tests/lib/fuzz_zlog.c
@@ -94,7 +94,7 @@ int main(int argc, char **argv)
 	cfg->fd = fd;
 
 	cmd_hostname_set("TEST");
-	cfg->master = thread_master_create("TEST");
+	cfg->master = event_master_create("TEST");
 
 	zlog_5424_apply_dst(cfg);
 
diff --git a/tests/lib/northbound/test_oper_data.c b/tests/lib/northbound/test_oper_data.c
index 7329cf1af..e7d5328bb 100644
--- a/tests/lib/northbound/test_oper_data.c
+++ b/tests/lib/northbound/test_oper_data.c
@@ -351,7 +351,7 @@ static void vty_do_exit(int isexit)
 	vty_terminate();
 	nb_terminate();
 	yang_terminate();
-	thread_master_free(master);
+	event_master_free(master);
 
 	log_memstats(stderr, "test-nb-oper-data");
 	if (!isexit)
@@ -377,7 +377,7 @@ int main(int argc, char **argv)
 	umask(0027);
 
 	/* master init. */
-	master = thread_master_create(NULL);
+	master = event_master_create(NULL);
 
 	zlog_aux_init("NONE: ", ZLOG_DISABLED);
 
diff --git a/tests/lib/test_assert.c b/tests/lib/test_assert.c
index 356be12c1..cefdc113a 100644
--- a/tests/lib/test_assert.c
+++ b/tests/lib/test_assert.c
@@ -39,7 +39,7 @@ int main(int argc, char **argv)
 	assertf(number > 1, "(B) the number was %d", number);
 
 	/* set up SIGABRT handler */
-	master = thread_master_create("test");
+	master = event_master_create("test");
 	signal_init(master, 0, NULL);
 
 	func_for_bt(number);
diff --git a/tests/lib/test_grpc.cpp b/tests/lib/test_grpc.cpp
index 3bfe98a66..dd067e9f1 100644
--- a/tests/lib/test_grpc.cpp
+++ b/tests/lib/test_grpc.cpp
@@ -97,7 +97,7 @@ static void static_startup(void)
 
 	static_debug_init();
 
-	master = thread_master_create(NULL);
+	master = event_master_create(NULL);
 	nb_init(master, staticd_yang_modules, array_size(staticd_yang_modules),
 		false);
 
@@ -139,7 +139,7 @@ static void static_shutdown(void)
 	cmd_terminate();
 	nb_terminate();
 	yang_terminate();
-	thread_master_free(master);
+	event_master_free(master);
 	master = NULL;
 }
 
diff --git a/tests/lib/test_segv.c b/tests/lib/test_segv.c
index 91c29c5ad..b417ac536 100644
--- a/tests/lib/test_segv.c
+++ b/tests/lib/test_segv.c
@@ -56,7 +56,7 @@ static void threadfunc(struct event *thread)
 
 int main(void)
 {
-	master = thread_master_create(NULL);
+	master = event_master_create(NULL);
 	signal_init(master, array_size(sigs), sigs);
 
 	zlog_aux_init("NONE: ", LOG_DEBUG);
diff --git a/tests/lib/test_sig.c b/tests/lib/test_sig.c
index 28101a241..e3005f744 100644
--- a/tests/lib/test_sig.c
+++ b/tests/lib/test_sig.c
@@ -40,7 +40,7 @@ struct event t;
 
 int main(void)
 {
-	master = thread_master_create(NULL);
+	master = event_master_create(NULL);
 	signal_init(master, array_size(sigs), sigs);
 
 	zlog_aux_init("NONE: ", LOG_DEBUG);
diff --git a/tests/lib/test_timer_correctness.c b/tests/lib/test_timer_correctness.c
index ae5ec1dc7..c8ae5fa19 100644
--- a/tests/lib/test_timer_correctness.c
+++ b/tests/lib/test_timer_correctness.c
@@ -54,7 +54,7 @@ static void terminate_test(void)
 		exit_code = 0;
 	}
 
-	thread_master_free(master);
+	event_master_free(master);
 	XFREE(MTYPE_TMP, log_buf);
 	XFREE(MTYPE_TMP, expected_buf);
 	prng_free(prng);
@@ -97,7 +97,7 @@ int main(int argc, char **argv)
 	struct event t;
 	struct timeval **alarms;
 
-	master = thread_master_create(NULL);
+	master = event_master_create(NULL);
 
 	log_buf_len = SCHEDULE_TIMERS * (TIMESTR_LEN + 1) + 1;
 	log_buf_pos = 0;
diff --git a/tests/lib/test_timer_performance.c b/tests/lib/test_timer_performance.c
index 017d90334..f197a8d03 100644
--- a/tests/lib/test_timer_performance.c
+++ b/tests/lib/test_timer_performance.c
@@ -34,7 +34,7 @@ int main(int argc, char **argv)
 	struct timeval tv_start, tv_lap, tv_stop;
 	unsigned long t_schedule, t_remove;
 
-	master = thread_master_create(NULL);
+	master = event_master_create(NULL);
 	prng = prng_new(0);
 	timers = calloc(SCHEDULE_TIMERS, sizeof(*timers));
 
@@ -80,7 +80,7 @@ int main(int argc, char **argv)
 	fflush(stdout);
 
 	free(timers);
-	thread_master_free(master);
+	event_master_free(master);
 	prng_free(prng);
 	return 0;
 }
diff --git a/tests/lib/test_zmq.c b/tests/lib/test_zmq.c
index bb6a29e68..dd9d10b97 100644
--- a/tests/lib/test_zmq.c
+++ b/tests/lib/test_zmq.c
@@ -266,7 +266,7 @@ static void run_server(int syncfd)
 	char dummy = 0;
 	struct event t;
 
-	master = thread_master_create(NULL);
+	master = event_master_create(NULL);
 	signal_init(master, array_size(sigs), sigs);
 	frrzmq_init();
 
@@ -284,7 +284,7 @@ static void run_server(int syncfd)
 
 	zmq_close(zmqsock);
 	frrzmq_finish();
-	thread_master_free(master);
+	event_master_free(master);
 	log_memstats_stderr("test");
 }