Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

use ABT after calling margo_init #659

Merged
merged 1 commit into from
Aug 9, 2021
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions server/src/unifyfs_server.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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);
Expand Down