Changeset 2324 for XIOS/dev/dev_ym/XIOS_COUPLING/src/context_client.cpp

Timestamp:

04/15/22 13:05:33 (2 years ago)

Author:

ymipsl

Message:

Solve deadlock or crash occuring when activate second levels of servers.

YM

File:

• XIOS/dev/dev_ym/XIOS_COUPLING/src/context_client.cpp (modified) (3 diffs)

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

@@ -175 +175 @@
       if (isAttachedModeEnabled()) // couldBuffer is always true in attached mode
       {
-        while (checkBuffers(ranks)) context_->globalEventLoop() ;
+        while (checkBuffers(ranks)) callGlobalEventLoop() ;
       
         CXios::getDaemonsManager()->scheduleContext(hashId_) ;
-        while (CXios::getDaemonsManager()->isScheduledContext(hashId_)) context_->globalEventLoop() ;
+        while (CXios::getDaemonsManager()->isScheduledContext(hashId_)) callGlobalEventLoop() ;
       }
       
@@ -287 +287 @@
           checkBuffers();
 
-          context_->globalEventLoop() ;
+          callGlobalEventLoop() ;
         }
 
@@ -301 +301 @@
    }
 
+   void CContextClient::eventLoop(void)
+   {
+      if (!locked_) checkBuffers() ;
+   }
+
+   void CContextClient::callGlobalEventLoop(void)
+   {
+     locked_=true ;
+     context_->globalEventLoop() ;
+     locked_=false ;
+   }
    /*!
    Make a new buffer for a certain connection to server with specific rank