Changeset 2230 for XIOS/dev/dev_ym/XIOS_COUPLING/src/context_server.cpp

Timestamp:

09/14/21 15:17:59 (3 years ago)

Author:

ymipsl

Message:

Fix some Dead-lock issue...
YM

File:

• XIOS/dev/dev_ym/XIOS_COUPLING/src/context_server.cpp (modified) (4 diffs)

XIOS/dev/dev_ym/XIOS_COUPLING/src/context_server.cpp

@@ -56 +56 @@
   //  {
       //if (!isAttachedModeEnabled()) eventScheduler_=CXios::getPoolRessource()->getService(contextInfo.serviceId,contextInfo.partitionId)->getEventScheduler() ;
-      eventScheduler_=CXios::getPoolRessource()->getService(contextInfo.serviceId,contextInfo.partitionId)->getEventScheduler() ;
-
+    eventScheduler_=CXios::getPoolRessource()->getService(contextInfo.serviceId,contextInfo.partitionId)->getEventScheduler() ;
+    MPI_Comm_dup(intraComm, &processEventBarrier_) ;
   //  }
 
@@ -92 +92 @@
         }
         else MPI_Comm_split(interCommMerged, interCommMergedRank, rank, &winComm);
-        MPI_Comm_free(&winComm) ;
+//       ym : Warning : intelMPI doesn't support that communicator of windows be deallocated before the windows deallocation, crash at MPI_Win_lock
+//            Bug or not ?          
+        // MPI_Comm_free(&winComm) ;
       }
     }
@@ -346 +348 @@
         else if (isAttachedModeEnabled() || eventScheduler_->queryEvent(currentTimeLine,hashId) )
         {
-          MPI_Request req ;
-          MPI_Status status ;
-
-          MPI_Ibarrier(intraComm,&req) ;
-          int flag=false ;
-          do  
+
+          if (!eventScheduled_) 
           {
-            eventScheduler_->checkEvent()  ;
-            MPI_Test(&req,&flag,&status) ;
-          } while (!flag) ;
-
+            MPI_Ibarrier(processEventBarrier_,&processEventRequest_) ;
+            eventScheduled_=true ;
+            return ;
+          }
+          else 
+          {
+            MPI_Status status ;
+            int flag ;
+            MPI_Test(&processEventRequest_, &flag, &status) ;
+            if (!flag) return ;
+            eventScheduled_=false ;
+          }
+
+          if (!isAttachedModeEnabled()) eventScheduler_->popEvent() ;
           //MPI_Barrier(intraComm) ;
          // When using attached mode, synchronise the processes to avoid that differents event be scheduled by differents processes
@@ -469 +477 @@
     }
   }
+
+  bool CContextServer::isCollectiveEvent(CEventServer& event)
+  {
+    if (event.classId==CField::GetType()) return CField::isCollectiveEvent(event);
+    else return true ;
+  }
 }