Merge pull request #2453 from artpol84/lazy_wait_v2.x

hppritcha · web-flow · commit 1bb8747523f8 · 2016-11-24T11:21:59.000-07:00
ompi/mpi_init: lazy-wait during PMIx fence execution
diff --git a/ompi/runtime/ompi_mpi_init.c b/ompi/runtime/ompi_mpi_init.c
@@ -20,6 +20,7 @@
  * Copyright (c) 2014-2015 Intel, Inc. All rights reserved.
  * Copyright (c) 2014-2015 Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2016      Mellanox Technologies Ltd. All rights reserved.
  *
  * $COPYRIGHT$
  *
@@ -639,7 +640,7 @@ int ompi_mpi_init(int argc, char **argv, int requested, int *provided)
         if (NULL != opal_pmix.fence_nb) {
             opal_pmix.fence_nb(NULL, opal_pmix_collect_all_data,
                                fence_release, (void*)&active);
-            OMPI_WAIT_FOR_COMPLETION(active);
+            OMPI_LAZY_WAIT_FOR_COMPLETION(active);
         } else {
             opal_pmix.fence(NULL, opal_pmix_collect_all_data);
         }
@@ -809,7 +810,7 @@ int ompi_mpi_init(int argc, char **argv, int requested, int *provided)
     if (NULL != opal_pmix.fence_nb) {
         opal_pmix.fence_nb(NULL, opal_pmix_collect_all_data,
                            fence_release, (void*)&active);
-        OMPI_WAIT_FOR_COMPLETION(active);
+        OMPI_LAZY_WAIT_FOR_COMPLETION(active);
     } else {
         opal_pmix.fence(NULL, opal_pmix_collect_all_data);
     }

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@`
`20`	`20`	`* Copyright (c) 2014-2015 Intel, Inc. All rights reserved.`
`21`	`21`	`* Copyright (c) 2014-2015 Research Organization for Information Science`
`22`	`22`	`* and Technology (RIST). All rights reserved.`
	`23`	`+ * Copyright (c) 2016 Mellanox Technologies Ltd. All rights reserved.`
`23`	`24`	`*`
`24`	`25`	`* $COPYRIGHT$`
`25`	`26`	`*`
`@@ -639,7 +640,7 @@ int ompi_mpi_init(int argc, char *argv, int requested, int provided)`
`639`	`640`	`if (NULL != opal_pmix.fence_nb) {`
`640`	`641`	`opal_pmix.fence_nb(NULL, opal_pmix_collect_all_data,`
`641`	`642`	`fence_release, (void*)&active);`
`642`		`- OMPI_WAIT_FOR_COMPLETION(active);`
	`643`	`+ OMPI_LAZY_WAIT_FOR_COMPLETION(active);`
`643`	`644`	`} else {`
`644`	`645`	`opal_pmix.fence(NULL, opal_pmix_collect_all_data);`
`645`	`646`	`}`
`@@ -809,7 +810,7 @@ int ompi_mpi_init(int argc, char *argv, int requested, int provided)`
`809`	`810`	`if (NULL != opal_pmix.fence_nb) {`
`810`	`811`	`opal_pmix.fence_nb(NULL, opal_pmix_collect_all_data,`
`811`	`812`	`fence_release, (void*)&active);`
`812`		`- OMPI_WAIT_FOR_COMPLETION(active);`
	`813`	`+ OMPI_LAZY_WAIT_FOR_COMPLETION(active);`
`813`	`814`	`} else {`
`814`	`815`	`opal_pmix.fence(NULL, opal_pmix_collect_all_data);`
`815`	`816`	`}`