to be squashed: move wait-for-init loop to ompi_mpi_init()

(Note: this commit would have been squashed with the prior commit, but
#5092 was accidentally merged
before the 2 commits were squashed together)

Signed-off-by: Jeff Squyres <jsquyres@cisco.com>
(cherry picked from commit 9b9cb5f)

ompi/runtime/ompi_mpi_init.c

@@ -398,8 +398,12 @@ int ompi_mpi_init(int argc, char **argv, int requested, int *provided,
         } else if (expected >= OMPI_MPI_STATE_INIT_STARTED) {
             // In some cases (e.g., oshmem_shmem_init()), we may call
             // ompi_mpi_init() multiple times.  In such cases, just
-            // silently return successfully.
+            // silently return successfully once the initializing
+            // thread has completed.
             if (reinit_ok) {
+                while (ompi_mpi_state < OMPI_MPI_STATE_INIT_COMPLETED) {
+                    usleep(1);
+                }
                 return MPI_SUCCESS;
             }
 

oshmem/runtime/oshmem_shmem_init.c

@@ -145,13 +145,7 @@ int oshmem_shmem_init(int argc, char **argv, int requested, int *provided)
 
     if (!oshmem_shmem_initialized) {
         ret = ompi_mpi_init(argc, argv, requested, provided, true);
-
-        // It's posible that another thread is initializing MPI and
-        // has not completed yet.  Keep checking until it is
-        // completed.
-        while (ompi_mpi_state < OMPI_MPI_STATE_INIT_COMPLETED) {
-            usleep(1);
-        }
+        OMPI_TIMING_NEXT("ompi_mpi_init");
 
         if (OSHMEM_SUCCESS != ret) {
             return ret;