Changeset 1071 for XIOS/dev/dev_olga/src/context_client.cpp

Timestamp:

03/13/17 17:21:04 (7 years ago)

Author:

oabramkina

Message:

dev: test for secondary servers added.

File:

• XIOS/dev/dev_olga/src/context_client.cpp (modified) (8 diffs)

XIOS/dev/dev_olga/src/context_client.cpp

@@ -91 +91 @@
         // We force the getBuffers call to be non-blocking on the servers
         list<CBufferOut*> buffList;
-        bool couldBuffer = getBuffers(ranks, sizes, buffList, !CXios::isClient);
 //        bool couldBuffer = getBuffers(ranks, sizes, buffList, CXios::isServer);
+        bool couldBuffer = getBuffers(ranks, sizes, buffList, false);
 
         if (couldBuffer)
@@ -182 +182 @@
      * \return whether the already allocated buffers could be used
     */
-    bool CContextClient::getBuffers(const list<int>& serverList, const list<int>& sizeList, list<CBufferOut*>& retBuffers, bool nonBlocking /*= false*/)
+    bool CContextClient::getBuffers(const list<int>& serverList, const list<int>& sizeList, list<CBufferOut*>& retBuffers,
+                                    bool nonBlocking /*= false*/)
     {
       list<int>::const_iterator itServer, itSize;
@@ -211 +212 @@
         {
           checkBuffers();
-//          if (?)
-//          {
+
+         // WHY DO WE PUT HERE SERVER INTO LISTENING LOOP AT ALL????
+//            context->server->listen();
 //            for (int i = 0; i < context->serverPrimServer.size(); ++i)
 //              context->serverPrimServer[i]->listen();
-//          }
-//          else
-            context->server->listen();
         }
       } while (!areBuffersFree && !nonBlocking);
@@ -237 +236 @@
    void CContextClient::newBuffer(int rank)
    {
-      if (!mapBufferSize_.count(rank))
-      {
-        error(0) << "WARNING: Unexpected request for buffer to communicate with server " << rank << std::endl;
-        mapBufferSize_[rank] = CXios::minBufferSize;
-      }
-      CClientBuffer* buffer = buffers[rank] = new CClientBuffer(interComm, rank, mapBufferSize_[rank], maxBufferedEvents);
-      // Notify the server
-      CBufferOut* bufOut = buffer->getBuffer(sizeof(StdSize));
-      bufOut->put(mapBufferSize_[rank]); // Stupid C++
-      buffer->checkBuffer();
+     if (!mapBufferSize_.count(rank))
+     {
+       error(0) << "WARNING: Unexpected request for buffer to communicate with server " << rank << std::endl;
+       mapBufferSize_[rank] = CXios::minBufferSize;
+     }
+     CClientBuffer* buffer = buffers[rank] = new CClientBuffer(interComm, rank, mapBufferSize_[rank], maxBufferedEvents);
+     // Notify the server
+     CBufferOut* bufOut = buffer->getBuffer(sizeof(StdSize));
+     bufOut->put(mapBufferSize_[rank]); // Stupid C++
+     buffer->checkBuffer();
    }
 
@@ -262 +261 @@
 
    //! Release all buffers
-   void CContextClient::releaseBuffers(void)
+   void CContextClient::releaseBuffers()
    {
       map<int,CClientBuffer*>::iterator itBuff;
       for (itBuff = buffers.begin(); itBuff != buffers.end(); itBuff++) delete itBuff->second;
+//        buffersReleased_ = true;
    }
 
@@ -273 +273 @@
    \return state of buffers, pending(true), ready(false)
    */
+//   bool CContextClient::checkBuffers(list<int>& ranks)
    bool CContextClient::checkBuffers(list<int>& ranks)
    {
@@ -358 +359 @@
    Finalize context client and do some reports
    */
-  void CContextClient::finalize(void)
+//  void CContextClient::finalize(void)
+  void CContextClient::finalize()
   {
     map<int,CClientBuffer*>::iterator itBuff;
@@ -396 +398 @@
     std::map<int,StdSize>::const_iterator itbMap = mapBufferSize_.begin(),
                                           iteMap = mapBufferSize_.end(), itMap;
+
     StdSize totalBuf = 0;
     for (itMap = itbMap; itMap != iteMap; ++itMap)