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

Timestamp:

07/04/17 14:28:50 (7 years ago)

Author:

oabramkina

Message:

Two server levels: simplifying context finalization.
Send of context finalization is blocking now on all server types.

File:

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

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

@@ -413 +413 @@
      // (1) blocking send context finalize to its server
      // (2) blocking receive context finalize from its server
-     // (3) send post finalize to its server
+     // (3) some memory deallocations
      if (CXios::isClient)
      {
@@ -428 +428 @@
            server->eventLoop();
 
-         if (CXios::isServer) // Mode attache
-           postFinalize();
-         else                  // Mode server
-           client->postFinalize();
-
-       }
-     }
-     // Server: non-blocking send context finalize
+         if (hasServer) // Mode attache
+         {
+           closeAllFile();
+           registryOut->hierarchicalGatherRegistry() ;
+           if (server->intraCommRank==0) CXios::globalRegistry->mergeRegistry(*registryOut) ;
+         }
+
+         //! Deallocate client buffers
+         client->releaseBuffers();
+
+         //! Free internally allocated communicators
+         for (std::list<MPI_Comm>::iterator it = comms.begin(); it != comms.end(); ++it)
+           MPI_Comm_free(&(*it));
+         comms.clear();
+
+         info(20)<<"CContext: Context <"<<getId()<<"> is finalized."<<endl;
+       }
+     }
      else if (CXios::isServer)
      {
-       // First context finalize message received from a model => send context finalize to its child contexts (if any)
+       // First context finalize message received from a model
+       // Send context finalize to its child contexts (if any)
        if (countChildCtx_ == 0)
          for (int i = 0; i < clientPrimServer.size(); ++i)
@@ -445 +456 @@
        // (Last) context finalized message received
        if (countChildCtx_ == clientPrimServer.size())
+       {
+         // Blocking send of context finalize message to its client (e.g. primary server or model)
          client->finalize();
+         bool bufferReleased;
+         do
+         {
+           client->checkBuffers();
+           bufferReleased = !client->havePendingRequests();
+         } while (!bufferReleased);
+         finalized = true;
+
+         if (hasServer && !hasClient)
+         {
+           closeAllFile();
+           registryOut->hierarchicalGatherRegistry() ;
+           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
+         for (std::list<MPI_Comm>::iterator it = comms.begin(); it != comms.end(); ++it)
+           MPI_Comm_free(&(*it));
+         comms.clear();
+
+         info(20)<<"CContext: Context <"<<getId()<<"> is finalized."<<endl;
+       }
 
        ++countChildCtx_;
      }
-   }
-
-   /*!
-   * \fn void CContext::postFinalize(void)
-   * Close files, gather registries, and make deallocations.
-   * Function is called when a context is finalized.
-   */
-   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);
-
-     // Primary or classical server: block until all messages are sent to model
-     // Client (model): block until all messages are sent to server
-     if ( CServer::serverLevel==0 || CServer::serverLevel==1 || !hasServer)
-     do
-     {
-       client->checkBuffers();
-       buffersReleased = !client->havePendingRequests();
-     } while (!buffersReleased);
-
-     if (hasServer && !hasClient)
-     {
-       closeAllFile();
-       registryOut->hierarchicalGatherRegistry() ;
-       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
-     for (std::list<MPI_Comm>::iterator it = comms.begin(); it != comms.end(); ++it)
-       MPI_Comm_free(&(*it));
-     comms.clear();
-
-     info(20)<<"CContext: Context <"<<getId()<<"> is finalized."<<endl;
-
    }
 
@@ -530 +517 @@
      checkGridEnabledFields();    
 
-     setClientServerBuffer(client);
+     // Buffer for primary server for connection to client will be allocated by default (to min size)
+     if (CServer::serverLevel != 1)
+       setClientServerBuffer(client);
      if (hasServer)
        for (int i = 0; i < clientPrimServer.size(); ++i)