use ABT after calling margo_init

LLNL · Aug 3, 2021 · e6935df · e6935df
1 parent fc7cb5b
commit e6935df
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/server/src/unifyfs_server.c b/server/src/unifyfs_server.c
@@ -363,8 +363,6 @@ int main(int argc, char* argv[])
     }
 
     LOGDBG("initializing rpc service");
-    ABT_init(argc, argv);
-    ABT_mutex_create(&app_configs_abt_sync);
     rc = configurator_bool_val(server_cfg.margo_lazy_connect,
                                &margo_lazy_connect);
     rc = configurator_bool_val(server_cfg.margo_tcp,
@@ -375,6 +373,11 @@ int main(int argc, char* argv[])
         exit(1);
     }
 
+    /* This must come after margo_init so that ABT has been initialized.
+     * We defer to Margo to call ABT_init, because Margo configures ABT
+     * in a particular way. */
+    ABT_mutex_create(&app_configs_abt_sync);
+
     /* launch the service manager (note: must happen after ABT_init) */
     LOGDBG("launching service manager thread");
     rc = svcmgr_init();