*: Convert thread_master_XXX functions to event_master_XXX

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

diff --git a/bgpd/bgpd.c b/bgpd/bgpd.c
index 3bf5709c9e9f6912468cef1a6a74c1aa04a97d51..33b46f7fe00b6ce7b864b7eab1b556081d9bd2f2 100644 (file)
--- a/bgpd/bgpd.c
+++ b/bgpd/bgpd.c
@@ -3897,7 +3897,7 @@ int bgp_delete(struct bgp *bgp)
        if (bgp->process_queue)
                work_queue_free_and_null(&bgp->process_queue);
 
-       thread_master_free_unused(bm->master);
+       event_master_free_unused(bm->master);
        bgp_unlock(bgp); /* initial reference */
 
        return 0;

diff --git a/lib/event.c b/lib/event.c
index 3789c5f15bd6753d76709c86003491460ceb462d..c23f1f8a99832a4c8ae415908a1beac1d921126d 100644 (file)
--- a/lib/event.c
+++ b/lib/event.c
@@ -544,7 +544,7 @@ static void initializer(void)
        pthread_key_create(&thread_current, NULL);
 }
 
-struct event_master *thread_master_create(const char *name)
+struct event_master *event_master_create(const char *name)
 {
        struct event_master *rv;
        struct rlimit limit;
@@ -623,7 +623,7 @@ struct event_master *thread_master_create(const char *name)
        return rv;
 }
 
-void thread_master_set_name(struct event_master *master, const char *name)
+void event_master_set_name(struct event_master *master, const char *name)
 {
        frr_with_mutex (&master->mtx) {
                XFREE(MTYPE_EVENT_MASTER, master->name);
@@ -682,14 +682,14 @@ static void thread_array_free(struct event_master *m,
 }
 
 /*
- * thread_master_free_unused
+ * event_master_free_unused
  *
  * As threads are finished with they are put on the
  * unuse list for later reuse.
  * If we are shutting down, Free up unused threads
  * So we can see if we forget to shut anything off
  */
-void thread_master_free_unused(struct event_master *m)
+void event_master_free_unused(struct event_master *m)
 {
        frr_with_mutex (&m->mtx) {
                struct event *t;
@@ -699,7 +699,7 @@ void thread_master_free_unused(struct event_master *m)
 }
 
 /* Stop thread scheduler. */
-void thread_master_free(struct event_master *m)
+void event_master_free(struct event_master *m)
 {
        struct event *t;
 
@@ -858,7 +858,7 @@ static int fd_poll(struct event_master *m, const struct timeval *timer_wait,
 
        /*
         * If timer_wait is null here, that means poll() should block
-        * indefinitely, unless the thread_master has overridden it by setting
+        * indefinitely, unless the event_master has overridden it by setting
         * ->selectpoll_timeout.
         *
         * If the value is positive, it specifies the maximum number of
@@ -1320,7 +1320,7 @@ static void cancel_arg_helper(struct event_master *master,
 /**
  * Process cancellation requests.
  *
- * This may only be run from the pthread which owns the thread_master.
+ * This may only be run from the pthread which owns the event_master.
  *
  * @param master the thread master to process
  * @REQUIRE master->mtx
@@ -1433,7 +1433,7 @@ static void cancel_event_helper(struct event_master *m, void *arg, int flags)
  *
  * MT-Unsafe
  *
- * @param m the thread_master to cancel from
+ * @param m the event_master to cancel from
  * @param arg the argument passed when creating the event
  */
 void event_cancel_event(struct event_master *master, void *arg)
@@ -1446,7 +1446,7 @@ void event_cancel_event(struct event_master *master, void *arg)
  *
  * MT-Unsafe
  *
- * @param m the thread_master to cancel from
+ * @param m the event_master to cancel from
  * @param arg the argument passed when creating the event
  */
 void event_cancel_event_ready(struct event_master *m, void *arg)
@@ -1502,7 +1502,7 @@ void event_cancel(struct event **thread)
  * The last two parameters are mutually exclusive, i.e. if you pass one the
  * other must be NULL.
  *
- * When the cancellation procedure executes on the target thread_master, the
+ * When the cancellation procedure executes on the target event_master, the
  * thread * provided is checked for nullity. If it is null, the thread is
  * assumed to no longer exist and the cancellation request is a no-op. Thus
  * users of this API must pass a back-reference when scheduling the original

diff --git a/lib/event.h b/lib/event.h
index 9f8e8831f31a91a106da0d6f40a7e2468488920c..7ea4152e58676fadbaa3934f8f9b8d6204fd76d0 100644 (file)
--- a/lib/event.h
+++ b/lib/event.h
@@ -209,10 +209,10 @@ struct cpu_event_history {
        }) /* end */
 
 /* Prototypes. */
-extern struct event_master *thread_master_create(const char *name);
-void thread_master_set_name(struct event_master *master, const char *name);
-extern void thread_master_free(struct event_master *m);
-extern void thread_master_free_unused(struct event_master *m);
+extern struct event_master *event_master_create(const char *name);
+void event_master_set_name(struct event_master *master, const char *name);
+extern void event_master_free(struct event_master *m);
+extern void event_master_free_unused(struct event_master *m);
 
 extern void _event_add_read_write(const struct xref_eventsched *xref,
                                  struct event_master *master,

diff --git a/lib/frr_pthread.c b/lib/frr_pthread.c
index 0c7d2c475ba70fbe659e743a3276ae01c915574b..c4ead01bf6eaae97adc76564c4966344eb1127ed 100644 (file)
--- a/lib/frr_pthread.c
+++ b/lib/frr_pthread.c
@@ -75,7 +75,7 @@ struct frr_pthread *frr_pthread_new(const struct frr_pthread_attr *attr,
        /* initialize mutex */
        pthread_mutex_init(&fpt->mtx, NULL);
        /* create new thread master */
-       fpt->master = thread_master_create(name);
+       fpt->master = event_master_create(name);
        /* set attributes */
        fpt->attr = *attr;
        name = (name ? name : "Anonymous thread");
@@ -101,7 +101,7 @@ struct frr_pthread *frr_pthread_new(const struct frr_pthread_attr *attr,
 
 static void frr_pthread_destroy_nolock(struct frr_pthread *fpt)
 {
-       thread_master_free(fpt->master);
+       event_master_free(fpt->master);
        pthread_mutex_destroy(&fpt->mtx);
        pthread_mutex_destroy(fpt->running_cond_mtx);
        pthread_cond_destroy(fpt->running_cond);

diff --git a/lib/grammar_sandbox_main.c b/lib/grammar_sandbox_main.c
index 1e0f67a11408377505117570ad2cf92165d88f08..5f72dcbebae572d4de30590e82b275f960280a96 100644 (file)
--- a/lib/grammar_sandbox_main.c
+++ b/lib/grammar_sandbox_main.c
@@ -29,7 +29,7 @@ int main(int argc, char **argv)
 {
        struct event event;
 
-       master = thread_master_create(NULL);
+       master = event_master_create(NULL);
 
        zlog_aux_init("NONE: ", LOG_DEBUG);
 

diff --git a/lib/libfrr.c b/lib/libfrr.c
index d7e87adc45fc2ed9d145660c30172d34519bd80a..6b75797124c7dd7825f2ebf90dd39312a10b9a9a 100644 (file)
--- a/lib/libfrr.c
+++ b/lib/libfrr.c
@@ -769,7 +769,7 @@ struct event_master *frr_init(void)
 
        zprivs_init(di->privs);
 
-       master = thread_master_create(NULL);
+       master = event_master_create(NULL);
        signal_init(master, di->n_signals, di->signals);
        hook_call(frr_early_init, master);
 
@@ -1213,7 +1213,7 @@ void frr_fini(void)
        frr_pthread_finish();
        zprivs_terminate(di->privs);
        /* signal_init -> nothing needed */
-       thread_master_free(master);
+       event_master_free(master);
        master = NULL;
        zlog_tls_buffer_fini();
        zlog_fini();

diff --git a/ospfclient/ospfclient.c b/ospfclient/ospfclient.c
index d3ba642d7233cd629f959fcee59df2d6cd1ada93..b884e0e0efd296200f53c654006b564763d77b1a 100644 (file)
--- a/ospfclient/ospfclient.c
+++ b/ospfclient/ospfclient.c
@@ -293,7 +293,7 @@ int main(int argc, char *argv[])
        /* Initialization */
        zprivs_preinit(&ospfd_privs);
        zprivs_init(&ospfd_privs);
-       master = thread_master_create(NULL);
+       master = event_master_create(NULL);
 
        /* Open connection to OSPF daemon */
        oclient = ospf_apiclient_connect(args[1], ASYNCPORT);

diff --git a/tests/bgpd/test_aspath.c b/tests/bgpd/test_aspath.c
index a20116a43c7c2b4fc9b2a2575566603d7e396938..5460be101edf29fcf62cabe0a1a8cafebee27033 100644 (file)
--- a/tests/bgpd/test_aspath.c
+++ b/tests/bgpd/test_aspath.c
@@ -1405,7 +1405,7 @@ int main(void)
 {
        int i = 0;
        qobj_init();
-       bgp_master_init(thread_master_create(NULL), BGP_SOCKET_SNDBUF_SIZE,
+       bgp_master_init(event_master_create(NULL), BGP_SOCKET_SNDBUF_SIZE,
                        list_new());
        master = bm->master;
        bgp_option_set(BGP_OPT_NO_LISTEN);

diff --git a/tests/bgpd/test_capability.c b/tests/bgpd/test_capability.c
index ab36a0a32134ab5262dc19ecc238f594152c50e8..9ba43e14f1a0a5475aa3192f66348b940a2c2771 100644 (file)
--- a/tests/bgpd/test_capability.c
+++ b/tests/bgpd/test_capability.c
@@ -925,7 +925,7 @@ int main(void)
        term_bgp_debug_as4 = -1UL;
 
        qobj_init();
-       master = thread_master_create(NULL);
+       master = event_master_create(NULL);
        bgp_master_init(master, BGP_SOCKET_SNDBUF_SIZE, list_new());
        vrf_init(NULL, NULL, NULL, NULL);
        bgp_option_set(BGP_OPT_NO_LISTEN);

diff --git a/tests/bgpd/test_mp_attr.c b/tests/bgpd/test_mp_attr.c
index ef42559404dbe69ae6be864b4d157cde728204a8..96daa182d72f0a7891937fd94d1b337ddae9f550 100644 (file)
--- a/tests/bgpd/test_mp_attr.c
+++ b/tests/bgpd/test_mp_attr.c
@@ -1070,7 +1070,7 @@ int main(void)
        qobj_init();
        cmd_init(0);
        bgp_vty_init();
-       master = thread_master_create("test mp attr");
+       master = event_master_create("test mp attr");
        bgp_master_init(master, BGP_SOCKET_SNDBUF_SIZE, list_new());
        vrf_init(NULL, NULL, NULL, NULL);
        bgp_option_set(BGP_OPT_NO_LISTEN);

diff --git a/tests/bgpd/test_mpath.c b/tests/bgpd/test_mpath.c
index 3eea19e8f854359c5d0d54540fcb987ecc281edf..348ce9e451337fdb78685fa17c9a7dad92d92fce 100644 (file)
--- a/tests/bgpd/test_mpath.c
+++ b/tests/bgpd/test_mpath.c
@@ -378,7 +378,7 @@ int all_tests_count = array_size(all_tests);
 static int global_test_init(void)
 {
        qobj_init();
-       master = thread_master_create(NULL);
+       master = event_master_create(NULL);
        zclient = zclient_new(master, &zclient_options_default, NULL, 0);
        bgp_master_init(master, BGP_SOCKET_SNDBUF_SIZE, list_new());
        vrf_init(NULL, NULL, NULL, NULL);
@@ -393,7 +393,7 @@ static int global_test_cleanup(void)
 {
        if (zclient != NULL)
                zclient_free(zclient);
-       thread_master_free(master);
+       event_master_free(master);
        return 0;
 }
 

diff --git a/tests/bgpd/test_packet.c b/tests/bgpd/test_packet.c
index 6563d5eb9e80d0d9ab3fb1f4492f23d977526b27..3492a95fab6c06166ccaabd923b3e38f56a54b30 100644 (file)
--- a/tests/bgpd/test_packet.c
+++ b/tests/bgpd/test_packet.c
@@ -45,7 +45,7 @@ int main(int argc, char *argv[])
 
        qobj_init();
        bgp_attr_init();
-       master = thread_master_create(NULL);
+       master = event_master_create(NULL);
        bgp_master_init(master, BGP_SOCKET_SNDBUF_SIZE, list_new());
        vrf_init(NULL, NULL, NULL, NULL);
        bgp_option_set(BGP_OPT_NO_LISTEN);

diff --git a/tests/bgpd/test_peer_attr.c b/tests/bgpd/test_peer_attr.c
index a6a5d6097d304ec0ed1aa663707ed8b384167d0e..349a51634de3c20122066ba4159df3e0374c0235 100644 (file)
--- a/tests/bgpd/test_peer_attr.c
+++ b/tests/bgpd/test_peer_attr.c
@@ -1363,7 +1363,7 @@ static void bgp_startup(void)
        zprivs_preinit(&bgpd_privs);
        zprivs_init(&bgpd_privs);
 
-       master = thread_master_create(NULL);
+       master = event_master_create(NULL);
        nb_init(master, NULL, 0, false);
        bgp_master_init(master, BGP_SOCKET_SNDBUF_SIZE, list_new());
        bgp_option_set(BGP_OPT_NO_LISTEN);
@@ -1412,7 +1412,7 @@ static void bgp_shutdown(void)
        nb_terminate();
        yang_terminate();
        zprivs_terminate(&bgpd_privs);
-       thread_master_free(master);
+       event_master_free(master);
        master = NULL;
 }
 

diff --git a/tests/helpers/c/main.c b/tests/helpers/c/main.c
index 4ae72fa29af5f5ea34a160d023d62ff9b5b98fc1..d5be750460551dc462e44dde4fbb8d0e31f6b220 100644 (file)
--- a/tests/helpers/c/main.c
+++ b/tests/helpers/c/main.c
@@ -92,7 +92,7 @@ int main(int argc, char **argv)
        progname = ((p = strrchr(argv[0], '/')) ? ++p : argv[0]);
 
        /* master init. */
-       master = thread_master_create(NULL);
+       master = event_master_create(NULL);
 
        while (1) {
                int opt;

diff --git a/tests/isisd/test_isis_spf.c b/tests/isisd/test_isis_spf.c
index d7465cc8f8ee380c44b20be0a78c2a66eea3999a..b14ef290781c49b2704ad560b80b4cb7b6a10968 100644 (file)
--- a/tests/isisd/test_isis_spf.c
+++ b/tests/isisd/test_isis_spf.c
@@ -455,7 +455,7 @@ static void vty_do_exit(int isexit)
        cmd_terminate();
        vty_terminate();
        yang_terminate();
-       thread_master_free(master);
+       event_master_free(master);
 
        log_memstats(stderr, "test-isis-spf");
        if (!isexit)
@@ -521,7 +521,7 @@ int main(int argc, char **argv)
        }
 
        /* master init. */
-       master = thread_master_create(NULL);
+       master = event_master_create(NULL);
        isis_master_init(master);
 
        /* Library inits. */

diff --git a/tests/lib/cli/common_cli.c b/tests/lib/cli/common_cli.c
index 843baa1f6d3532d08399387b7bdded836d64a284..bc3a4b5340025554390f7f91fa67928b6843e1b0 100644 (file)
--- 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 ad9677a718df1fe4a928146513da646394535ab0..d308f8eb2f7e3b561dc895031eb123bddb75be83 100644 (file)
--- 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 7329cf1afd06c16e45fd1c73b8ce88cb2c5887f6..e7d5328bb5e29be968381b607c59bd43cb1b1e2a 100644 (file)
--- 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 356be12c1ac7f5b26cd43a83d479bc7c239bb222..cefdc113aef7320fe1f9e94f70eaeecb0a7cca8d 100644 (file)
--- 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 3bfe98a66f055ba74c806dd82587065cfa44cfe0..dd067e9f12ed50a10745450a405749b72435ae1c 100644 (file)
--- 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 91c29c5ad596760cd54948bfdbdd32b3beed9625..b417ac536528f5f9b86dfb0281b5815842634151 100644 (file)
--- 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 28101a241044cb050dda0f7de0a99f1e4ef1467c..e3005f744793114058b571f0e7f52c9dcc70b764 100644 (file)
--- 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 ae5ec1dc724f22eb55ba1c81a222adf9e397cbb8..c8ae5fa1905b155e2aaeb254bcef589b0341da7e 100644 (file)
--- 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 017d90334e5805e82801cca0d98a1cc727b22d96..f197a8d039d19235bad0415fdbb3e9e612277ab3 100644 (file)
--- 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 bb6a29e68d11a56397a4dc70e6646704b8f31fae..dd9d10b9712f55484b1d874714952eff8e593a3a 100644 (file)
--- 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");
 }
 

diff --git a/tests/ospfd/test_ospf_spf.c b/tests/ospfd/test_ospf_spf.c
index 2bf3a9f76d7d0fdbc4e1725b166a323270af547e..7d1d7ae262c78e07ac0fac182da13417f7d07186 100644 (file)
--- a/tests/ospfd/test_ospf_spf.c
+++ b/tests/ospfd/test_ospf_spf.c
@@ -208,7 +208,7 @@ static void vty_do_exit(int isexit)
 
        cmd_terminate();
        vty_terminate();
-       thread_master_free(master);
+       event_master_free(master);
 
        if (!isexit)
                exit(0);
@@ -273,7 +273,7 @@ int main(int argc, char **argv)
        }
 
        /* master init. */
-       master = thread_master_create(NULL);
+       master = event_master_create(NULL);
 
        /* Library inits. */
        cmd_init(1);

diff --git a/vtysh/vtysh_main.c b/vtysh/vtysh_main.c
index 47517010befd9f92ee4ebdf6041676c5826ef7e4..7b92ac2204a023b49b236c39df1ad2c7e4a0614d 100644 (file)
--- a/vtysh/vtysh_main.c
+++ b/vtysh/vtysh_main.c
@@ -228,7 +228,7 @@ static void vtysh_rl_run(void)
 {
        struct event thread;
 
-       master = thread_master_create(NULL);
+       master = event_master_create(NULL);
 
        rl_callback_handler_install(vtysh_prompt(), vtysh_rl_callback);
        event_add_read(master, vtysh_rl_read, NULL, STDIN_FILENO,
@@ -240,7 +240,7 @@ static void vtysh_rl_run(void)
        if (!vtysh_loop_exited)
                rl_callback_handler_remove();
 
-       thread_master_free(master);
+       event_master_free(master);
 }
 
 static void log_it(const char *line)