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

Timestamp:

05/18/17 19:27:26 (7 years ago)

Author:

oabramkina

Message:

Fixing a bug in context finalization. Now context finalization is done in two stages.
Tested on Cure with test_regular and test_xios2_cmip6.

File:

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

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

@@ -26 +26 @@
       : CObjectTemplate<CContext>(), CContextAttributes()
       , calendar(), hasClient(false), hasServer(false)
-      , isPostProcessed(false)//, finalized(false)
+      , isPostProcessed(false), finalized(false)
       , idServer_(), client(0), server(0)
       , allProcessed(false), countChildCtx_(0)
@@ -34 +34 @@
       : CObjectTemplate<CContext>(id), CContextAttributes()
       , calendar(), hasClient(false), hasServer(false)
-      , isPostProcessed(false)//, finalized(false)
+      , isPostProcessed(false), finalized(false)
       , idServer_(), client(0), server(0)
       , allProcessed(false), countChildCtx_(0)
@@ -45 +45 @@
      for (std::vector<CContextClient*>::iterator it = clientPrimServer.begin(); it != clientPrimServer.end(); it++)  delete *it;
      for (std::vector<CContextServer*>::iterator it = serverPrimServer.begin(); it != serverPrimServer.end(); it++)  delete *it;
+
    }
 
@@ -391 +392 @@
     else if (CServer::serverLevel == 1)
     {
-      client->checkBuffers();
-      bool serverFinished = server->eventLoop();
+      if (!finalized)
+        client->checkBuffers();
+      bool serverFinished = true;
+      if (!finalized)
+        serverFinished = server->eventLoop();
       bool serverPrimFinished = true;
       for (int i = 0; i < clientPrimServer.size(); ++i)
       {
-        clientPrimServer[i]->checkBuffers();
-        serverPrimFinished *= serverPrimServer[i]->eventLoop();
+        if (!finalized)
+          clientPrimServer[i]->checkBuffers();
+        if (!finalized)
+          serverPrimFinished *= serverPrimServer[i]->eventLoop();
       }
       return ( serverFinished && serverPrimFinished);
@@ -419 +425 @@
      // (1) blocking send context finalize to its server
      // (2) blocking receive context finalize from its server
+     // (3) send post finalize to its server
      if (CXios::isClient)
      {
@@ -432 +439 @@
          while (!server->hasFinished())
            server->eventLoop();
+
+         if (CXios::isServer) // Mode attache
+           postFinalize();
+         else                  // Mode server
+           client->postFinalize();
+
        }
      }
@@ -442 +455 @@
            clientPrimServer[i]->finalize();
 
-       // (Last) context finalized message received => send context finalize to its parent context
+       // (Last) context finalized message received
+       // Close files, gather registries, send context finalize to its parent context
        if (countChildCtx_ == clientPrimServer.size())
          client->finalize();
@@ -448 +462 @@
        ++countChildCtx_;
      }
-
-     // If in mode attache call postFinalize
-     if (CXios::isServer && CXios::isClient)
-       postFinalize();
    }
 
    /*!
    * \fn void CContext::postFinalize(void)
-   * Close files, gather registries, , and make deallocations.
+   * Close files, gather registries, and make deallocations.
    * Function is called when a context is finalized (it has nothing to receive and nothing to send).
    */
    void CContext::postFinalize(void)
    {
+     finalized = true;
+
+     // Primary server: blocking send post finalize to secondary servers
+     for (int i = 0; i < clientPrimServer.size(); ++i)
+       clientPrimServer[i]->postFinalize();
+     bool buffersReleased;
+     do
+     {
+       buffersReleased = true;
+       for (int i = 0; i < clientPrimServer.size(); ++i)
+       {
+         clientPrimServer[i]->checkBuffers();
+         buffersReleased *= !clientPrimServer[i]->havePendingRequests();
+       }
+     } while (!buffersReleased);
+
      info(20)<<"Context <"<<getId()<<"> is finalized."<<endl;
 
@@ -469 +495 @@
        if (server->intraCommRank==0) CXios::globalRegistry->mergeRegistry(*registryOut) ;
      }
+
+     //! Deallocate client buffers
+     client->releaseBuffers();
+     for (int i = 0; i < clientPrimServer.size(); ++i)
+       clientPrimServer[i]->releaseBuffers();
 
      //! Free internally allocated communicators
@@ -475 +506 @@
      comms.clear();
 
-     //! Deallocate client buffers
-     client->releaseBuffers();
-     for (int i = 0; i < clientPrimServer.size(); ++i)
-       clientPrimServer[i]->releaseBuffers();
    }
 
@@ -1000 +1027 @@
    void CContext::recvCreateFileHeader(CBufferIn& buffer)
    {
-     // The creation of header file should be delegated to server2, for now
-      // if (hasClient && hasServer)
-      // {        
-      //   sendCreateFileHeader();
-      // }
-      
       if (!hasClient && hasServer) 
         createFileHeader();
@@ -1014 +1035 @@
    {
       // Use correct context client to send message
-     // int nbSrvPools = (hasServer) ? clientPrimServer.size() : 1;
      int nbSrvPools = (this->hasServer) ? (this->hasClient ? this->clientPrimServer.size() : 0) : 1;
      for (int i = 0; i < nbSrvPools; ++i)
@@ -1151 +1171 @@
       // Find all enabled fields of each file
       this->findAllEnabledFields();
-      // this->findAllEnabledFieldsInReadModeFiles();
       // For now, only read files with client and only one level server
       if (hasClient && !hasServer) this->findAllEnabledFieldsInReadModeFiles();
@@ -1162 +1181 @@
      }
 
-      // // Only search and rebuild all reference objects of enable fields, don't transform
-      // this->solveOnlyRefOfEnabledFields(false);
-
-      // // Search and rebuild all reference object of enabled fields
-      // this->solveAllRefOfEnabledFields(false);
-
-      // // Find all fields with read access from the public API
-      // findFieldsWithReadAccess();
-      // // and solve the all reference for them
-      // solveAllRefOfFieldsWithReadAccess();
-
       // Only search and rebuild all reference objects of enable fields, don't transform
       this->solveOnlyRefOfEnabledFields(false);
 
       // Search and rebuild all reference object of enabled fields, and transform
-      // this->solveAllEnabledFields
       this->solveAllRefOfEnabledFieldsAndTransform(false);
-      // // Check grid and calculate its distribution
-      // if (hasClient) checkGridEnabledFields();
 
       // Find all fields with read access from the public API
@@ -1585 +1590 @@
   /*!
   * \fn bool CContext::isFinalized(void)
-  * Context is finalized if:
-  * (1) it has received all context finalize events
-  * (2) it has no pending events to send.
+  * Context is finalized if it received context post finalize event.
   */
   bool CContext::isFinalized(void)
   {
-    if (countChildCtx_==clientPrimServer.size()+1)
-    {
-      bool buffersReleased = !client->havePendingRequests();
-      for (int i = 0; i < clientPrimServer.size(); ++i)
-        buffersReleased *= !clientPrimServer[i]->havePendingRequests();
-      return buffersReleased;
-    }
-    else
-      return false;
+    return finalized;
   }