diff --git a/server/src/unifyfs_server.c b/server/src/unifyfs_server.c index f2192fa28..9519c5a8f 100644 --- a/server/src/unifyfs_server.c +++ b/server/src/unifyfs_server.c @@ -396,8 +396,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, @@ -408,6 +406,11 @@ int main(int argc, char* argv[]) exit(1); } + /* We wait to call any ABT functions until after margo_init. + * Margo configures ABT in a particular way, so we defer to + * Margo to call ABT_init. */ + ABT_mutex_create(&app_configs_abt_sync); + ABT_mutex_lock(app_configs_abt_sync); failed_clients = arraylist_create(0); ABT_mutex_unlock(app_configs_abt_sync);