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

Timestamp:

04/22/22 11:46:41 (2 years ago)

Author:

ymipsl

Message:

Fix Deadlock from reading phase.
YM

File:

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

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

@@ -115 +115 @@
     CTimer::get("check pending request").suspend();
     CTimer::get("check event process").resume();
-    if (enableEventsProcessing)  processEvents();
+    processEvents(enableEventsProcessing);
     CTimer::get("check event process").suspend();
     return finished;
@@ -320 +320 @@
         buffers[rank]->freeBuffer(count) ;
         delete buffers[rank] ;
-        buffers[rank] = new CServerBuffer(windows_[rank], winAdress, 0, newSize) ;
+        buffers[rank] = new CServerBuffer(windows_[rank], winAdress, 0, 2*newSize) ;
         info(100)<<"Context id "<<context->getId()<<" : Receive ChangeBufferSize from client rank "<<rank
                  <<"  newSize : "<<newSize<<" Address : "<<winAdress[0]<<" & "<<winAdress[1]<<endl ;
@@ -339 +339 @@
   }
 
-  void CContextServer::processEvents(void)
+  void CContextServer::processEvents(bool enableEventsProcessing)
   {
     map<size_t,CEventServer*>::iterator it;
@@ -363 +363 @@
         else if (isAttachedModeEnabled() || eventScheduler_->queryEvent(currentTimeLine,hashId) )
         {
+          if (!enableEventsProcessing && isCollectiveEvent(*event)) return ;
 
           if (!eventScheduled_) 
@@ -498 +499 @@
   bool CContextServer::isCollectiveEvent(CEventServer& event)
   {
-    if (event.classId==CField::GetType()) return CField::isCollectiveEvent(event);
+    if (event.type>1000) return false ;
     else return true ;
   }