Skip to content

v3.1.x: btl-portals4: don't free module resources when proc count goes to zero #5065

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
May 14, 2018
Merged

v3.1.x: btl-portals4: don't free module resources when proc count goes to zero #5065

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 2 additions & 9 deletions opal/mca/btl/portals4/btl_portals4.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,18 +389,13 @@ mca_btl_portals4_add_procs(struct mca_btl_base_module_t* btl_base,
struct mca_btl_portals4_module_t* portals4_btl = (struct mca_btl_portals4_module_t*) btl_base;
int ret;
size_t i;
bool need_activate = false;

opal_output_verbose(50, opal_btl_base_framework.framework_output,
"mca_btl_portals4_add_procs: Adding %d procs (%d) for NI %d",
(int) nprocs,
(int) portals4_btl->portals_num_procs,
portals4_btl->interface_num);

if (0 == portals4_btl->portals_num_procs) {
need_activate = true;
}

/*
* The PML handed us a list of procs that need Portals4
* peer info. Complete those procs here.
Expand Down Expand Up @@ -435,7 +430,7 @@ mca_btl_portals4_add_procs(struct mca_btl_base_module_t* btl_base,
portals4_btl->interface_num));
}

if (need_activate && portals4_btl->portals_num_procs > 0) {
if (mca_btl_portals4_component.need_init && portals4_btl->portals_num_procs > 0) {
if (mca_btl_portals4_component.use_logical) {
ret = create_maptable(portals4_btl, nprocs, procs, btl_peer_data);
if (OPAL_SUCCESS != ret) {
Expand All @@ -453,6 +448,7 @@ mca_btl_portals4_add_procs(struct mca_btl_base_module_t* btl_base,
__FILE__, __LINE__, ret);
return ret;
}
mca_btl_portals4_component.need_init = 0;
}

return OPAL_SUCCESS;
Expand All @@ -479,9 +475,6 @@ mca_btl_portals4_del_procs(struct mca_btl_base_module_t *btl,
OPAL_THREAD_ADD32(&portals4_btl->portals_num_procs, -1);
}

if (0 == portals4_btl->portals_num_procs)
mca_btl_portals4_free_module(portals4_btl);

return OPAL_SUCCESS;
}

Expand Down