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

Timestamp:

05/15/17 15:00:24 (7 years ago)

Author:

oabramkina

Message:

Two-level server: merging new grid functionalities and changes in the communication protocol (e.g. non-blocking context finalize, registries, oasis).

Tests on curie: test_client, test_complete, nemo (test_xios2_cmip6.exe).

To do: non-structured grid, check reading, possible bug in client/server initialization (?).

File:

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

XIOS/dev/dev_olga/src/context_client.cpp

@@ -11 +11 @@
 #include "timer.hpp"
 #include "cxios.hpp"
+#include "server.hpp"
 
 namespace xios
@@ -89 +90 @@
         list<int> sizes = event.getSizes();
 
-        // We force the getBuffers call to be non-blocking on the servers
+        // We force the getBuffers call to be non-blocking on classical servers
         list<CBufferOut*> buffList;
-//        bool couldBuffer = getBuffers(ranks, sizes, buffList, CXios::isServer);
-        bool couldBuffer = getBuffers(ranks, sizes, buffList, false);
+        bool couldBuffer = getBuffers(ranks, sizes, buffList, (!CXios::isClient && (CServer::serverLevel == 0) ));
+        //bool couldBuffer = getBuffers(ranks, sizes, buffList, false );
 
         if (couldBuffer)
@@ -212 +213 @@
         {
           checkBuffers();
-
-         // 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();
+          if (CServer::serverLevel == 0)
+            context->server->listen();
+
+          else if (CServer::serverLevel == 1)
+          {
+            context->server->listen();
+            for (int i = 0; i < context->serverPrimServer.size(); ++i)
+              context->serverPrimServer[i]->listen();
+          }
+
+          else if (CServer::serverLevel == 2)
+            context->server->listen();
+
         }
       } while (!areBuffersFree && !nonBlocking);
+
       CTimer::get("Blocking time").suspend();
 
@@ -256 +266 @@
       map<int,CClientBuffer*>::iterator itBuff;
       bool pending = false;
-      for (itBuff = buffers.begin(); itBuff != buffers.end(); itBuff++) pending |= itBuff->second->checkBuffer();
+      for (itBuff = buffers.begin(); itBuff != buffers.end(); itBuff++)
+        pending |= itBuff->second->checkBuffer();
       return pending;
    }
@@ -274 +285 @@
    \return state of buffers, pending(true), ready(false)
    */
-//   bool CContextClient::checkBuffers(list<int>& ranks)
    bool CContextClient::checkBuffers(list<int>& ranks)
    {
@@ -358 +368 @@
 
    /*!
-   Finalize context client and do some reports
-   */
-//  void CContextClient::finalize(void)
-  void CContextClient::finalize()
+   * Finalize context client and do some reports. Function is non-blocking.
+   */
+  void CContextClient::finalize(void)
   {
     map<int,CClientBuffer*>::iterator itBuff;
@@ -386 +395 @@
 
     CTimer::get("Blocking time").resume();
-    while (!stop)
+//    while (!stop)
     {
       checkBuffers();
@@ -393 +402 @@
 
       stop = true;
-      for (itBuff = buffers.begin(); itBuff != buffers.end(); itBuff++) stop &= !itBuff->second->hasPendingRequest();
+//      for (itBuff = buffers.begin(); itBuff != buffers.end(); itBuff++) stop &= !itBuff->second->hasPendingRequest();
     }
     CTimer::get("Blocking time").suspend();
@@ -409 +418 @@
     report(0) << " Memory report : Context <" << context->getId() << "> : client side : total memory used for buffer " << totalBuf << " bytes" << endl;
 
-    releaseBuffers();
+    //releaseBuffers(); // moved to CContext::finalize()
   }
+
+  /*!
+  */
+  bool CContextClient::havePendingRequests(void)
+  {
+    bool pending = false;
+    map<int,CClientBuffer*>::iterator itBuff;
+    for (itBuff = buffers.begin(); itBuff != buffers.end(); itBuff++)
+      pending |= itBuff->second->hasPendingRequest();
+    return pending;
+  }
+
+
 }