Changeset 1378

Timestamp:

12/13/17 16:11:58 (7 years ago)

Author:

ymipsl

Message:

Attemping to solve a dead-lock rising at finalize :
Server 1 must be able receive buffer of on other context (ie from server2) when awaiting free buffer.
To be tested extensively...

YM

Location:

XIOS/dev/XIOS_DEV_CMIP6/src

Files:

• context_client.cpp (modified) (1 diff)
• node/context.cpp (modified) (5 diffs)
• node/context.hpp (modified) (1 diff)
• server.hpp (modified) (1 diff)

XIOS/dev/XIOS_DEV_CMIP6/src/context_client.cpp

@@ -246 +246 @@
             for (int i = 0; i < context->serverPrimServer.size(); ++i)
               context->serverPrimServer[i]->listen();
-//            CServer::contextEventLoop(false) ; // avoid dead-lock at finalize...
+            CServer::contextEventLoop(false) ; // avoid dead-lock at finalize...
           }
 

XIOS/dev/XIOS_DEV_CMIP6/src/node/context.cpp

@@ -396 +396 @@
 
    //! Try to send the buffers and receive possible answers
-  bool CContext::checkBuffersAndListen(void)
+  bool CContext::checkBuffersAndListen(bool enableEventsProcessing /*= true*/)
   {
     bool clientReady, serverFinished;
@@ -408 +408 @@
         hasTmpBufferedEvent = !client->sendTemporarilyBufferedEvent();
       // Don't process events if there is a temporarily buffered event
-      return server->eventLoop(!hasTmpBufferedEvent);
+      return server->eventLoop(!hasTmpBufferedEvent || !enableEventsProcessing);
     }
     else if (CServer::serverLevel == 1)
@@ -423 +423 @@
           clientPrimServer[i]->checkBuffers();
         if (!finalized)
-          serverPrimFinished *= serverPrimServer[i]->eventLoop();
+          serverPrimFinished *= serverPrimServer[i]->eventLoop(enableEventsProcessing);
       }
       return ( serverFinished && serverPrimFinished);
@@ -431 +431 @@
     {
       client->checkBuffers();
-      return server->eventLoop();
+      return server->eventLoop(enableEventsProcessing);
     }
   }
@@ -490 +490 @@
        {
          // Blocking send of context finalize message to its client (e.g. primary server or model)
+         info(100)<<"DEBUG: context "<<getId()<<" Send client finalize<<"<<endl ;
          client->finalize();
          bool bufferReleased;

XIOS/dev/XIOS_DEV_CMIP6/src/node/context.hpp

@@ -95 +95 @@
 
          // Put sever or client into loop state
-         bool checkBuffersAndListen(void);
+         bool checkBuffersAndListen(bool enableEventsProcessing=true);
 
          // Finalize a context

XIOS/dev/XIOS_DEV_CMIP6/src/server.hpp

@@ -16 +16 @@
         static void finalize(void);
         static void eventLoop(void);
-        static void contextEventLoop(void);
+        static void contextEventLoop(bool enableEventsProcessing=true);
         static void listenContext(void);
         static void listenFinalize(void);