run admin evloop on main thread to simplify thread setup a bit

src/core/admin/admin.c

@@ -307,7 +307,6 @@ core_admin_register(uint64_t intvl_ms, timeout_cb_fn cb, void *arg)
 {
     struct timeout delay;
 
-    ASSERT(!__atomic_load_n(&admin_running, __ATOMIC_RELAXED));
     ASSERT(admin_init);
 
     timeout_set_ms(&delay, intvl_ms);
@@ -327,8 +326,8 @@ _admin_evwait(void)
     return CC_OK;
 }
 
-void *
-core_admin_evloop(void *arg)
+void
+core_admin_evloop(void)
 {
     for(;;) {
         if (_admin_evwait() != CC_OK) {
@@ -339,7 +338,5 @@ core_admin_evloop(void *arg)
         timing_wheel_execute(tw);
     }
 
-    __atomic_store_n(&admin_running, false, __ATOMIC_RELAXED);
-
     exit(1);
 }

src/core/admin/admin.h

@@ -33,13 +33,11 @@ typedef struct {
     ADMIN_OPTION(OPTION_DECLARE)
 } admin_options_st;
 
-extern bool admin_running;
-
 void core_admin_setup(admin_options_st *options);
 void core_admin_teardown(void);
 
 /* add a periodic action to be executed on the admin thread, which uses timing wheel */
 struct timeout_event *
 core_admin_register(uint64_t intvl_ms, timeout_cb_fn cb, void *arg);
 
-void *core_admin_evloop(void *arg);
+void core_admin_evloop(void);

src/core/core.c

@@ -78,7 +78,7 @@ core_teardown(void)
 void
 core_run(void *arg_worker)
 {
-    pthread_t worker, admin;
+    pthread_t worker, server;
     int ret;
 
     if (!core_init) {
@@ -92,14 +92,13 @@ core_run(void *arg_worker)
         goto error;
     }
 
-    __atomic_store_n(&admin_running, true, __ATOMIC_RELAXED);
-    ret = pthread_create(&admin, NULL, core_admin_evloop, NULL);
+    ret = pthread_create(&server, NULL, core_server_evloop, NULL);
     if (ret != 0) {
-        log_crit("pthread create failed for admin thread: %s", strerror(ret));
+        log_crit("pthread create failed for server thread: %s", strerror(ret));
         goto error;
     }
 
-    core_server_evloop();
+    core_admin_evloop();
 
 error:
     core_teardown();

src/core/data/server.c

@@ -280,13 +280,15 @@ _server_evwait(void)
     return CC_OK;
 }
 
-void
-core_server_evloop(void)
+void *
+core_server_evloop(void *arg)
 {
     for(;;) {
         if (_server_evwait() != CC_OK) {
             log_crit("server core event loop exited due to failure");
             break;
         }
     }
+
+    exit(1);
 }

src/core/data/server.h

@@ -36,4 +36,4 @@ struct addrinfo;
 
 void core_server_setup(server_options_st *options, server_metrics_st *metrics);
 void core_server_teardown(void);
-void core_server_evloop(void);
+void *core_server_evloop(void *arg); /* arg is ignored, signature for pthread_create compatibility */