Changeset 2588

Timestamp:

10/05/23 18:06:06 (7 months ago)

Author:

ymipsl

Message:

fix potential dead-lock ; not sure it is enough...
YM

Location:

XIOS3/trunk/src

Files:

• manager/server_context.cpp (modified) (2 diffs)
• node/context.cpp (modified) (1 diff)

XIOS3/trunk/src/manager/server_context.cpp

@@ -72 +72 @@
     bool ok ;
     int type ;
-    MPI_Comm newInterCommClient, newInterCommServer ;
-    MPI_Comm_dup(contextComm_,&newInterCommClient) ;
-    MPI_Comm_dup(contextComm_,&newInterCommServer) ;
-    overlapedComm_[name_]=tuple<bool, MPI_Comm, MPI_Comm>(false, newInterCommClient, newInterCommServer) ;
-    MPI_Barrier(contextComm_) ;
+    
 
     if (intraCommRank==0)
@@ -107 +103 @@
     if (ok)  
     {
+      MPI_Comm newInterCommClient, newInterCommServer ;
+      MPI_Comm_dup(contextComm_,&newInterCommClient) ;
+      MPI_Comm_dup(contextComm_,&newInterCommServer) ;
+      overlapedComm_[name_]=tuple<bool, MPI_Comm, MPI_Comm>(false, newInterCommClient, newInterCommServer) ;
+      MPI_Barrier(contextComm_) ;
+
       int globalRank ;
       MPI_Comm_rank(xiosComm_,&globalRank) ;

XIOS3/trunk/src/node/context.cpp

@@ -587 +587 @@
     for(int i=0 ; i<nbPartitions; i++)
     {
-      while (!parentServerContext_->createIntercomm(poolId, serverId, i, getContextId(), intraComm_, interCommClient, interCommServer)) yield() ;
+      while (!parentServerContext_->createIntercomm(poolId, serverId, i, getContextId(), intraComm_, interCommClient, interCommServer, false)) yield() ;
       int type ; 
       if (commRank==0) while (!CXios::getServicesManager()->getServiceType(poolId, serverId, 0, type)) yield();