Changeset 1601 for XIOS/dev/dev_trunk_omp/src/node/context.cpp

Timestamp:

11/19/18 15:52:54 (5 years ago)

Author:

yushan

Message:

branch_openmp merged with trunk r1597

File:

• XIOS/dev/dev_trunk_omp/src/node/context.cpp (modified) (18 diffs)

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

@@ -21 +21 @@
 #include "distribute_file_server2.hpp"
 
+using namespace ep_lib;
+
 namespace xios {
 
-  std::shared_ptr<CContextGroup> CContext::root;
+  std::shared_ptr<CContextGroup> * CContext::root_ptr = 0;
 
    /// ////////////////////// Définitions ////////////////////// ///
@@ -66 +68 @@
    CContextGroup* CContext::getRoot(void)
    {
-      if (root.get()==NULL) root=std::shared_ptr<CContextGroup>(new CContextGroup(xml::CXMLNode::GetRootName()));
-      return root.get();
+      if(root_ptr == 0) root_ptr = new std::shared_ptr<CContextGroup>(new CContextGroup(xml::CXMLNode::GetRootName()));
+      return root_ptr->get();
    }
 
@@ -248 +250 @@
 
    //! Initialize client side
-   void CContext::initClient(MPI_Comm intraComm, MPI_Comm interComm, CContext* cxtServer /*= 0*/)
+   void CContext::initClient(ep_lib::MPI_Comm intraComm, ep_lib::MPI_Comm interComm, CContext* cxtServer /*= 0*/)
    {
 
      hasClient = true;
-     MPI_Comm intraCommServer, interCommServer;
+     ep_lib::MPI_Comm intraCommServer, interCommServer;
      
 
-     if (CServer::serverLevel != 1)
-      // initClient is called by client
+     if (CServer::serverLevel != 1) // initClient is called by client
      {
        client = new CContextClient(this, intraComm, interComm, cxtServer);
@@ -266 +267 @@
        else
        {
-         MPI_Comm_dup(intraComm, &intraCommServer);
+         ep_lib::MPI_Comm_dup(intraComm, &intraCommServer);
          comms.push_back(intraCommServer);
-         MPI_Comm_dup(interComm, &interCommServer);
+         ep_lib::MPI_Comm_dup(interComm, &interCommServer);
          comms.push_back(interCommServer);
        }
@@ -287 +288 @@
        server = new CContextServer(this, intraCommServer, interCommServer);
      }
-     else
-     // initClient is called by primary server
+
+     else // initClient is called by primary server
      {
        clientPrimServer.push_back(new CContextClient(this, intraComm, interComm));
-       MPI_Comm_dup(intraComm, &intraCommServer);
+       ep_lib::MPI_Comm_dup(intraComm, &intraCommServer);
        comms.push_back(intraCommServer);
-       MPI_Comm_dup(interComm, &interCommServer);
+       ep_lib::MPI_Comm_dup(interComm, &interCommServer);
        comms.push_back(interCommServer);
        serverPrimServer.push_back(new CContextServer(this, intraCommServer, interCommServer));
@@ -361 +362 @@
    }
 
-   void CContext::initServer(MPI_Comm intraComm, MPI_Comm interComm, CContext* cxtClient /*= 0*/)
+   void CContext::initServer(ep_lib::MPI_Comm intraComm, ep_lib::MPI_Comm interComm, CContext* cxtClient /*= 0*/)
    {
      hasServer=true;
@@ -379 +380 @@
      registryOut->setPath(contextRegistryId) ;
 
-     MPI_Comm intraCommClient, interCommClient;
+     ep_lib::MPI_Comm intraCommClient, interCommClient;
      if (cxtClient) // Attached mode
      {
@@ -387 +388 @@
      else
      {
-       MPI_Comm_dup(intraComm, &intraCommClient);
+       ep_lib::MPI_Comm_dup(intraComm, &intraCommClient);
        comms.push_back(intraCommClient);
-       MPI_Comm_dup(interComm, &interCommClient);
+       ep_lib::MPI_Comm_dup(interComm, &interCommClient);
        comms.push_back(interCommClient);
      }
@@ -475 +476 @@
 
          //! Free internally allocated communicators
-         for (std::list<MPI_Comm>::iterator it = comms.begin(); it != comms.end(); ++it)
-           MPI_Comm_free(&(*it));
+         for (std::list<ep_lib::MPI_Comm>::iterator it = comms.begin(); it != comms.end(); ++it)
+           ep_lib::MPI_Comm_free(&(*it));
          comms.clear();
 
+         #pragma omp critical (_output)
          info(20)<<"CContext: Context <"<<getId()<<"> is finalized."<<endl;
        }
@@ -494 +496 @@
        {
          // Blocking send of context finalize message to its client (e.g. primary server or model)
+         #pragma omp critical (_output)
          info(100)<<"DEBUG: context "<<getId()<<" Send client finalize<<"<<endl ;
          client->finalize();
@@ -517 +520 @@
 
          //! Free internally allocated communicators
-         for (std::list<MPI_Comm>::iterator it = comms.begin(); it != comms.end(); ++it)
-           MPI_Comm_free(&(*it));
+         for (std::list<ep_lib::MPI_Comm>::iterator it = comms.begin(); it != comms.end(); ++it)
+           ep_lib::MPI_Comm_free(&(*it));
          comms.clear();
 
+         #pragma omp critical (_output)
          info(20)<<"CContext: Context <"<<getId()<<"> is finalized."<<endl;
        }
@@ -531 +535 @@
    void CContext::freeComms(void)
    {
-     for (std::list<MPI_Comm>::iterator it = comms.begin(); it != comms.end(); ++it)
-       MPI_Comm_free(&(*it));
+     for (std::list<ep_lib::MPI_Comm>::iterator it = comms.begin(); it != comms.end(); ++it)
+       ep_lib::MPI_Comm_free(&(*it));
      comms.clear();
    }
@@ -1002 +1006 @@
        }
 
-       for (std::multimap<double,int>:: iterator it=poolDataSize.begin() ; it!=poolDataSize.end(); ++it) info(30)<<"Load Balancing for servers (perfect=1) : "<<it->second<<" :  ratio "<<it->first*1./dataPerPool<<endl ;
- 
+       for (std::multimap<double,int>:: iterator it=poolDataSize.begin() ; it!=poolDataSize.end(); ++it)
+       {
+         #pragma omp critical (_output)
+         info(30)<<"Load Balancing for servers (perfect=1) : "<<it->second<<" :  ratio "<<it->first*1./dataPerPool<<endl ;
+       }
+
        for (int i = 0; i < this->enabledReadModeFiles.size(); ++i)
        {
@@ -1091 +1099 @@
        }
 
-       for (int i = 0; i < nbPools; ++i) info(100)<<"Pool server level2 "<<i<<"   assigned file bandwith "<<bandwithSize[i]*86400.*4./1024/1024.<<" Mb / days"<<endl ;
-       for (int i = 0; i < nbPools; ++i) info(100)<<"Pool server level2 "<<i<<"   assigned grid memory "<<memorySize[i]*100/1024./1024.<<" Mb"<<endl ;
-
+       for (int i = 0; i < nbPools; ++i)
+       {
+         #pragma omp critical (_output)
+         info(100)<<"Pool server level2 "<<i<<"   assigned file bandwith "<<bandwithSize[i]*86400.*4./1024/1024.<<" Mb / days"<<endl ;
+       }
+       for (int i = 0; i < nbPools; ++i)
+       {
+         #pragma omp critical (_output)
+         info(100)<<"Pool server level2 "<<i<<"   assigned grid memory "<<memorySize[i]*100/1024./1024.<<" Mb"<<endl ;
+       }
 
        for (int i = 0; i < this->enabledReadModeFiles.size(); ++i)
@@ -1144 +1159 @@
      for (; it != end; it++)
      {
+       #pragma omp critical (_output)
        info(30)<<"Closing File : "<<(*it)->getId()<<endl;
        (*it)->close();
@@ -1831 +1847 @@
         }
 
+        #pragma omp critical (_output)
         info(50) << "updateCalendar : before : " << calendar->getCurrentDate() << endl;
         calendar->update(step);
+        #pragma omp critical (_output)
         info(50) << "updateCalendar : after : " << calendar->getCurrentDate() << endl;
   #ifdef XIOS_MEMTRACK_LIGHT
+        #pragma omp critical (_output)
         info(50) << " Current memory used by XIOS : "<<  MemTrack::getCurrentMemorySize()*1.0/(1024*1024)<<" Mbyte, at timestep "<<step<<" of context "<<this->getId()<<endl ;
   #endif
@@ -1845 +1864 @@
       }
       else if (prevStep == step)
+      {
+        #pragma omp critical (_output)
         info(50) << "updateCalendar: already at step " << step << ", no operation done." << endl;
+      }
       else // if (prevStep > step)
         ERROR("void CContext::updateCalendar(int step)",
@@ -1901 +1923 @@
     CContext* context = CObjectFactory::CreateObject<CContext>(id).get();
     getRoot();
-    if (!hasctxt) CGroupFactory::AddChild(root, context->getShared());
+    if (!hasctxt) CGroupFactory::AddChild(*root_ptr, context->getShared());
 
 #define DECLARE_NODE(Name_, name_) \