Changeset 992 for XIOS/dev/dev_olga/src/node/context.cpp

Timestamp:

11/16/16 18:00:52 (7 years ago)

Author:

oabramkina

Message:

First rebond on the secondary server pool. XIOS finalizes correctly.

File:

• XIOS/dev/dev_olga/src/node/context.cpp (modified) (6 diffs)

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

@@ -15 +15 @@
 #include "xios_spl.hpp"
 
+#include "server.hpp"
 
 namespace xios {
@@ -252 +253 @@
      {
        clientPrimServer = new CContextClient(this, intraComm, interComm);
-       serverPrimServer = new CContextServer(this, intraComm, interComm);
+       serverPrimServer = new CContextServer(this, 1, intraComm, interComm);  // just some int parameter to distinguish server from serverPrimServer on server1
      }
 
@@ -414 +415 @@
       {
         finalized = true;
-        if (hasClient) sendRegistry() ;
+//        if (hasClient) sendRegistry() ;
 
 /*        if (CXios::serverLevel == 0)
@@ -446 +447 @@
         }*/
 
-        client->finalize();
-        while (!server->hasFinished())
-        {
-          server->eventLoop();
-        }
-
         if ((hasClient) && (hasServer))
         {
@@ -458 +453 @@
           {
             serverPrimServer->eventLoop();
+            CServer::eventScheduler->checkEvent() ;
           }
         }
+
+        client->finalize();
+        while (!server->hasFinished())
+        {
+          server->eventLoop();
+        }
+
 
         if (hasServer)
@@ -1056 +1059 @@
       this->solveAllInheritance();
 
-      ShowTree(info(10));
+//      ShowTree(info(10));
 
       // Check if some axis, domains or grids are eligible to for compressed indexed output.