Changeset 726 for XIOS/trunk

Timestamp:

10/09/15 11:14:56 (9 years ago)

Author:

rlacroix

Message:

Delay the buffer size notication to the first time an event is sent.

This fixes synchronization issues in attached mode.

Location:

XIOS/trunk/src

Files:

• context_client.cpp (modified) (2 diffs)
• context_client.hpp (modified) (1 diff)

XIOS/trunk/src/context_client.cpp

@@ -114 +114 @@
 
     /*!
-    Special function to setup size of buffer not only on client side but also on server side
-    corresponding to the connection
-    */
-    void CContextClient::sendBufferSizeEvent()
-    {
-      std::map<int,CClientBuffer*>::iterator it, itE;
-      std::map<int,StdSize>::const_iterator itMap = mapBufferSize_.begin(), iteMap = mapBufferSize_.end();
-
-      if (itMap == iteMap)
-         ERROR("void CContextClient::sendBufferSizeEvent()",
-              <<"No information about server buffer, that should not happen...");
-
-      for (; itMap != iteMap; ++itMap)
-      {
-        if (buffers.end() == buffers.find(itMap->first))
-          newBuffer(itMap->first);
-      }
-
-      if (isAttachedModeEnabled())
-      {
-        while (checkBuffers())
-        {
-          parentServer->server->listen();
-        }
-        CContext::setCurrent(context->getId());
-      }
-    }
-
-    /*!
     If client is also server (attached mode), after sending event, it should process right away
     the incoming event.
@@ -267 +238 @@
    {
      mapBufferSize_ = mapSize;
-     sendBufferSizeEvent();
    }
 

XIOS/trunk/src/context_client.hpp

@@ -50 +50 @@
 
       void setBufferSize(const std::map<int,StdSize>& mapSize);
-      void sendBufferSizeEvent();
+
     public:
       CContext* context; //!< Context for client