Changeset 2241 for XIOS/dev

Timestamp:

09/30/21 14:25:40 (3 years ago)

Author:

jderouillat

Message:

Clean Context and it members before MPI_Finalize (to avoid some MPI call after MPI_Finalize, such as MPI_Free_mem in ServerBuffer? destructor)

Location:

XIOS/dev/dev_ym/XIOS_COUPLING/src

Files:

• cxios.cpp (modified) (2 diffs)
• object_template.hpp (modified) (1 diff)
• object_template_impl.hpp (modified) (1 diff)

XIOS/dev/dev_ym/XIOS_COUPLING/src/cxios.cpp

@@ -175 +175 @@
 
 #endif
+     
+     // Delete CContext
+     xios_map<StdString, xios_map<StdString, std::shared_ptr<CContext> > >* contextMap = CObjectTemplate<CContext>::GetAllMapobject();
+     for(auto it = contextMap->begin(); it != contextMap->end(); ++it)
+     {
+       for(auto it2 = it->second.begin(); it2 != it->second.end(); ++it2)
+       {
+           std::shared_ptr<CContext> todel = it2->second;
+           todel.reset();
+       }
+       it->second.clear();
+
+       std::vector<std::shared_ptr<CContext> >*  contextVect = CObjectTemplate<CContext>::GetAllVectobjectPtr(it->first);
+       for(auto it = contextVect->begin(); it != contextVect->end(); ++it)
+       {
+           it->reset();
+       }
+       contextVect->clear();
+       
+     }
+     contextMap->clear();
+     
   }
 
@@ -225 +247 @@
     report(0)<<CMemChecker::getAllCumulatedMem() ;
     CServer::closeInfoStream();
+    
+    // Delete CContext
+    xios_map<StdString, xios_map<StdString, std::shared_ptr<CContext> > >* contextMap = CObjectTemplate<CContext>::GetAllMapobject();
+    for(auto it = contextMap->begin(); it != contextMap->end(); ++it)
+    {
+      for(auto it2 = it->second.begin(); it2 != it->second.end(); ++it2)
+      {
+          std::shared_ptr<CContext> todel = it2->second;
+          todel.reset();
+      }
+      it->second.clear();
+
+      std::vector<std::shared_ptr<CContext> >*  contextVect = CObjectTemplate<CContext>::GetAllVectobjectPtr(it->first);
+      for(auto it = contextVect->begin(); it != contextVect->end(); ++it)
+      {
+          it->reset();
+      }
+      contextVect->clear();
+      
+    }
+    contextMap->clear();
   }
 

XIOS/dev/dev_ym/XIOS_COUPLING/src/object_template.hpp

@@ -69 +69 @@
          static std::vector<std::shared_ptr<DerivedType> > &
             GetAllVectobject(const StdString & contextId);
+         static std::vector<std::shared_ptr<DerivedType> > *
+            GetAllVectobjectPtr(const StdString & contextId);
+
+         static xios_map<StdString, xios_map<StdString, std::shared_ptr<DerivedType> > >*
+            GetAllMapobject();
+
 
          /// Destructeur ///

XIOS/dev/dev_ym/XIOS_COUPLING/src/object_template_impl.hpp

@@ -67 +67 @@
    {
       return (CObjectTemplate<T>::AllVectObj[contextId]);
+   }
+   template <class T>
+      std::vector<std::shared_ptr<T> > *
+         CObjectTemplate<T>::GetAllVectobjectPtr(const StdString & contextId)
+   {
+      return &(CObjectTemplate<T>::AllVectObj[contextId]);
+   }
+
+  template <class T>
+      xios_map<StdString, xios_map<StdString, std::shared_ptr<T> > >*
+         CObjectTemplate<T>::GetAllMapobject()
+   {
+      return &(CObjectTemplate<T>::AllMapObj);
    }