Skip to content

Commit 34d0790

Browse files
authored
Merge pull request #6526 from ggouaillardet/topic/vader_fini
btl/vader: fix finalize sequence
2 parents 4e5cacc + 77060ca commit 34d0790

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

opal/mca/btl/vader/btl_vader_component.c

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
* All rights reserved.
1717
* Copyright (c) 2011 NVIDIA Corporation. All rights reserved.
1818
* Copyright (c) 2014-2018 Intel, Inc. All rights reserved.
19-
* Copyright (c) 2014-2018 Research Organization for Information Science
20-
* and Technology (RIST). All rights reserved.
19+
* Copyright (c) 2014-2019 Research Organization for Information Science
20+
* and Technology (RIST). All rights reserved.
2121
* Copyright (c) 2018 Amazon.com, Inc. or its affiliates. All Rights reserved.
2222
* Copyright (c) 2018 Triad National Security, LLC. All rights
2323
* reserved.
@@ -342,6 +342,11 @@ static int mca_btl_vader_component_close(void)
342342
mca_btl_vader_knem_fini ();
343343
#endif
344344

345+
if (mca_btl_vader_component.mpool) {
346+
mca_btl_vader_component.mpool->mpool_finalize (mca_btl_vader_component.mpool);
347+
mca_btl_vader_component.mpool = NULL;
348+
}
349+
345350
return OPAL_SUCCESS;
346351
}
347352

opal/mca/btl/vader/btl_vader_module.c

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
* Copyright (c) 2010-2015 Los Alamos National Security, LLC. All rights
1616
* reserved.
1717
* Copyright (c) 2014-2015 Intel, Inc. All rights reserved.
18-
* Copyright (c) 2014-2015 Research Organization for Information Science
19-
* and Technology (RIST). All rights reserved.
18+
* Copyright (c) 2014-2019 Research Organization for Information Science
19+
* and Technology (RIST). All rights reserved.
2020
* Copyright (c) 2018-2019 Triad National Security, LLC. All rights
2121
* reserved.
2222
* $COPYRIGHT$
@@ -380,11 +380,6 @@ static int vader_finalize(struct mca_btl_base_module_t *btl)
380380
}
381381
#endif
382382

383-
if (component->mpool) {
384-
component->mpool->mpool_finalize (component->mpool);
385-
component->mpool = NULL;
386-
}
387-
388383
return OPAL_SUCCESS;
389384
}
390385

0 commit comments

Comments
 (0)