Changeset 1194 for XIOS

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.

Location:

XIOS/dev/dev_olga/src

Files:

• context_client.cpp (modified) (2 diffs)
• context_client.hpp (modified) (1 diff)
• context_server.cpp (modified) (2 diffs)
• node/context.cpp (modified) (4 diffs)
• node/context.hpp (modified) (2 diffs)

XIOS/dev/dev_olga/src/context_client.cpp

@@ -248 +248 @@
      if (!mapBufferSize_.count(rank))
      {
-       error(0) << "WARNING: Unexpected request for buffer to communicate with server " << rank << std::endl;
+//       error(0) << "WARNING: Unexpected request for buffer to communicate with server " << rank << std::endl;
        mapBufferSize_[rank] = CXios::minBufferSize;
      }
@@ -423 +423 @@
   }
 
-  /*!
-  * Finalize context client and do some reports. Function is non-blocking.
-  */
- void CContextClient::postFinalize(void)
- {
-   map<int,CClientBuffer*>::iterator itBuff;
-   bool stop = false;
-
-   CTimer::get("Blocking time").resume();
-   while (hasTemporarilyBufferedEvent())
-   {
-     checkBuffers();
-     sendTemporarilyBufferedEvent();
-   }
-   CTimer::get("Blocking time").suspend();
-
-   CEventClient event(CContext::GetType(), CContext::EVENT_ID_CONTEXT_POST_FINALIZE);
-   if (isServerLeader())
-   {
-     CMessage msg;
-     const std::list<int>& ranks = getRanksServerLeader();
-     for (std::list<int>::const_iterator itRank = ranks.begin(), itRankEnd = ranks.end(); itRank != itRankEnd; ++itRank)
-       event.push(*itRank, 1, msg);
-     sendEvent(event);
-   }
-   else sendEvent(event);
-
-   CTimer::get("Blocking time").resume();
-//   while (!stop)
-   {
-     checkBuffers();
-     if (hasTemporarilyBufferedEvent())
-       sendTemporarilyBufferedEvent();
-     stop = true;
-//     for (itBuff = buffers.begin(); itBuff != buffers.end(); itBuff++) stop &= !itBuff->second->hasPendingRequest();
-   }
-   CTimer::get("Blocking time").suspend();
-
- }
 
   /*!

XIOS/dev/dev_olga/src/context_client.hpp

@@ -53 +53 @@
 //      void closeContext(void);  Never been implemented.
       void finalize(void);
-      void postFinalize(void);
 
       void setBufferSize(const std::map<int,StdSize>& mapSize, const std::map<int,StdSize>& maxEventSize);

XIOS/dev/dev_olga/src/context_server.cpp

@@ -223 +223 @@
     {
       finished=true;
+      info(20)<<" CContextServer: Receive context <"<<context->getId()<<"> finalize."<<endl;
+      context->finalize();
       std::map<int, StdSize>::const_iterator itbMap = mapBufferSize_.begin(),
                            iteMap = mapBufferSize_.end(), itMap;
@@ -232 +234 @@
         totalBuf += itMap->second;
       }
-      context->finalize();
       report(0)<< " Memory report : Context <"<<ctxId<<"> : server side : total memory used for buffer "<<totalBuf<<" bytes"<<endl;
-    }
-    else if (event.classId==CContext::GetType() && event.type==CContext::EVENT_ID_CONTEXT_POST_FINALIZE)
-    {
-      info(20)<<" CContextServer: Receive context <"<<context->getId()<<"> finalize."<<endl;
-      context->postFinalize();
     }
     else if (event.classId==CContext::GetType()) CContext::dispatchEvent(event);

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)

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

@@ -51 +51 @@
            EVENT_ID_CLOSE_DEFINITION,EVENT_ID_UPDATE_CALENDAR,
            EVENT_ID_CREATE_FILE_HEADER,EVENT_ID_CONTEXT_FINALIZE,
-           EVENT_ID_CONTEXT_POST_FINALIZE,
            EVENT_ID_POST_PROCESS, EVENT_ID_SEND_REGISTRY,
            EVENT_ID_POST_PROCESS_GLOBAL_ATTRIBUTES,
@@ -100 +99 @@
          // Finalize a context
          void finalize(void);
-         void postFinalize(void);
          bool isFinalized(void);