Changeset 2324 for XIOS/dev/dev_ym/XIOS_COUPLING/src/node/context.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/node/context.cpp (modified) (5 diffs)

XIOS/dev/dev_ym/XIOS_COUPLING/src/node/context.cpp

@@ -684 +684 @@
     setCurrent(getId()) ;
 
-    if (client!=nullptr && !finalized) client->checkBuffers();
+    if (client!=nullptr && !finalized) client->eventLoop();
     
     for (int i = 0; i < clientPrimServer.size(); ++i)
     {
-      if (!finalized) clientPrimServer[i]->checkBuffers();
+      if (!finalized) clientPrimServer[i]->eventLoop();
       if (!finalized) finished &= serverPrimServer[i]->eventLoop(enableEventsProcessing);
     }
 
     for (auto couplerOut : couplerOutClient_)
-      if (!finalized) couplerOut.second->checkBuffers();
+      if (!finalized) couplerOut.second->eventLoop();
     
     for (auto couplerIn : couplerInClient_)
-      if (!finalized) couplerIn.second->checkBuffers();
+      if (!finalized) couplerIn.second->eventLoop();
     
     for (auto couplerOut : couplerOutServer_)
@@ -788 +788 @@
         client->finalize();
         info(100)<<"DEBUG: context "<<getId()<<" Client finalize sent"<<endl ;
-        while (client->havePendingRequests()) client->checkBuffers();
+        while (client->havePendingRequests()) client->eventLoop();
         info(100)<<"DEBUG: context "<<getId()<<" no pending request ok"<<endl ;
         bool notifiedFinalized=false ;
@@ -808 +808 @@
            do
            {
-             clientPrimServer[i]->checkBuffers();
+             clientPrimServer[i]->eventLoop();
              bufferReleased = !clientPrimServer[i]->havePendingRequests();
            } while (!bufferReleased);
@@ -1099 +1099 @@
     {
       for(auto field : fileOutField) slaveServers_.insert(field->getContextClient()) ; 
-      for(auto field : fileInField)  slaveServers_.insert(field->getContextClient()) ;  
     }
 
@@ -1709 +1708 @@
    TRY
    {
-     CEventClient event(getType(),EVENT_ID_UPDATE_CALENDAR);
      for(auto client : slaveServers_) 
      {
+       CEventClient event(getType(),EVENT_ID_UPDATE_CALENDAR);
        if (client->isServerLeader())
        {