Changeset 1033 for XIOS/trunk/src/node/context.cpp

Timestamp:

01/24/17 16:15:50 (7 years ago)

Author:

rlacroix

Message:

Make the XIOS server(s) completely non-blocking.

This fixes some deadlocks caused by bugs in the communication protocol when using inputs and multiple contexts.

File:

• XIOS/trunk/src/node/context.cpp (modified) (1 diff)

XIOS/trunk/src/node/context.cpp

@@ -339 +339 @@
    }
 
-   //! Server side: Put server into a loop in order to listen message from client
-   bool CContext::eventLoop(void)
-   {
-     return server->eventLoop();
-   }
-
    //! Try to send the buffers and receive possible answers
    bool CContext::checkBuffersAndListen(void)
    {
      client->checkBuffers();
-     return server->eventLoop();
+
+     bool hasTmpBufferedEvent = client->hasTemporarilyBufferedEvent();
+     if (hasTmpBufferedEvent)
+       hasTmpBufferedEvent = !client->sendTemporarilyBufferedEvent();
+
+     // Don't process events if there is a temporarily buffered event
+     return server->eventLoop(!hasTmpBufferedEvent);
    }