Merge pull request #5054 from tkordenbrock/topic/master/mtl-portals4.…

…finalize.fix master: mtl-portals4: don't call progress() in finalize() if Portals4 was not initialized
open-mpi · Apr 12, 2018 · d646a00 · d646a00
2 parents 3863ab9 + 9065967
commit d646a00
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/ompi/mca/mtl/portals4/mtl_portals4.c b/ompi/mca/mtl/portals4/mtl_portals4.c
@@ -548,8 +548,10 @@ ompi_mtl_portals4_del_procs(struct mca_mtl_base_module_t *mtl,
 int
 ompi_mtl_portals4_finalize(struct mca_mtl_base_module_t *mtl)
 {
-    opal_progress_unregister(ompi_mtl_portals4_progress);
-    while (0 != ompi_mtl_portals4_progress()) { }
+    if (0 == ompi_mtl_portals4.need_init) {
+        opal_progress_unregister(ompi_mtl_portals4_progress);
+        while (0 != ompi_mtl_portals4_progress()) { }
+    }
 
 #if OMPI_MTL_PORTALS4_FLOW_CONTROL
     ompi_mtl_portals4_flowctl_fini();