Changeset 2274 for XIOS/dev/dev_ym/XIOS_COUPLING/src/node

Timestamp:

12/09/21 12:28:20 (3 years ago)

Author:

ymipsl

Message:

Tracking memory leak : release memory statically alocated

YM

Location:

XIOS/dev/dev_ym/XIOS_COUPLING/src/node

Files:

• axis.cpp (modified) (1 diff)
• axis.hpp (modified) (2 diffs)
• context.cpp (modified) (6 diffs)
• context.hpp (modified) (3 diffs)
• domain.cpp (modified) (2 diffs)
• domain.hpp (modified) (1 diff)
• scalar.cpp (modified) (1 diff)
• scalar.hpp (modified) (2 diffs)

XIOS/dev/dev_ym/XIOS_COUPLING/src/node/axis.cpp

@@ -59 +59 @@
    }
    CATCH
+   
+   void CAxis::releaseStaticAllocation(void)
+   {
+     transformationMapList_.clear() ;
+     CTransformation<CAxis>::unregisterAllTransformations() ;
+     CGridTransformationFactory<CAxis>::unregisterAllTransformations() ;
+   }
 
    ///---------------------------------------------------------------

XIOS/dev/dev_ym/XIOS_COUPLING/src/node/axis.hpp

@@ -23 +23 @@
 #include "distribution_type.hpp"
 #include "generic_algorithm_transformation.hpp"
+#include "grid_transformation_factory_impl.hpp"
 
 
@@ -68 +69 @@
          CAxis(const CAxis & axis);       // Not implemented yet.
          CAxis(const CAxis * const axis); // Not implemented yet.
+         static void releaseStaticAllocation(void) ; // release static allocation on heap
 
          static CAxis* createAxis();

XIOS/dev/dev_ym/XIOS_COUPLING/src/node/context.cpp

@@ -63 +63 @@
      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;
-
+     if (registryIn!=nullptr) delete registryIn ;
+     if (registryOut!=nullptr) delete registryOut ;
    }
 
@@ -100 +101 @@
    CATCH
 
+   void CContext::releaseStaticAllocation(void)
+   TRY
+   {
+      CDomain::releaseStaticAllocation();
+      CAxis::releaseStaticAllocation();
+      CScalar::releaseStaticAllocation();
+      if (root) root.reset() ;
+   }
+   CATCH
+   
    //----------------------------------------------------------------
 
@@ -326 +337 @@
   #include "node_type.conf"
 */
+  CObjectFactory::deleteAllContexts<CContext>() ;
+  CObjectFactory::deleteAllContexts<CContextGroup>() ;
+  CObjectFactory::clearCurrentContextId();
+  CGroupFactory::clearCurrentContextId();
 }
    ///---------------------------------------------------------------
@@ -538 +553 @@
       if (commRank==0)
       {
-        if (attached_mode) CXios::getContextsManager()->createServerContext(CClient::getPoolRessource()->getId(), CXios::defaultServerId, 0, getContextId()) ;
+        if (attached_mode) CXios::getContextsManager()->createServerContext(CClient::getPoolRessource()->getId(), getContextId()+"_"+CXios::defaultServerId, 0, getContextId()) ;
         else if (CXios::usingServer2) CXios::getContextsManager()->createServerContext(CXios::defaultPoolId, CXios::defaultGathererId, 0, getContextId()) ;
         else  CXios::getContextsManager()->createServerContext(CXios::defaultPoolId, CXios::defaultServerId, 0, getContextId()) ;
@@ -547 +562 @@
       if (attached_mode)
       {
-        parentServerContext_->createIntercomm(CClient::getPoolRessource()->getId(), CXios::defaultServerId, 0, getContextId(), intraComm_, 
+        parentServerContext_->createIntercomm(CClient::getPoolRessource()->getId(), getContextId()+"_"+CXios::defaultServerId, 0, getContextId(), intraComm_, 
                                               interCommClient, interCommServer) ;
         int type ; 
@@ -811 +826 @@
         closeAllFile();
         client->releaseBuffers();
+        server->releaseBuffers();
       }
 

XIOS/dev/dev_ym/XIOS_COUPLING/src/node/context.hpp

@@ -82 +82 @@
          /// Destructeur ///
          virtual ~CContext(void);
+
+         static void releaseStaticAllocation(void) ;
 
          //---------------------------------------------------------
@@ -229 +231 @@
         // Get context root
         static CContextGroup* getRoot(void);
-
+       
         // Set current context
         static void setCurrent(const string& id);
@@ -329 +331 @@
          std::vector<std::string> primServerId_;
 
-         CRegistry* registryIn ;    //!< input registry which is read from file
-         CRegistry* registryOut ;   //!< output registry which will be written into file at the finalize
+         CRegistry* registryIn=nullptr ;    //!< input registry which is read from file
+         CRegistry* registryOut=nullptr ;   //!< output registry which will be written into file at the finalize
 
 

XIOS/dev/dev_ym/XIOS_COUPLING/src/node/domain.cpp

@@ -25 +25 @@
 #include "grid_gatherer_connector.hpp"
 #include "transformation_path.hpp"
+#include "grid_transformation_factory_impl.hpp"
 
 #include <algorithm>
@@ -62 +63 @@
    }
 
+   void CDomain::releaseStaticAllocation(void)
+   {
+     transformationMapList_.clear() ;
+     CTransformation<CDomain>::unregisterAllTransformations() ;
+     CGridTransformationFactory<CDomain>::unregisterAllTransformations() ;
+   }
    ///---------------------------------------------------------------
 

XIOS/dev/dev_ym/XIOS_COUPLING/src/node/domain.hpp

@@ -71 +71 @@
          CDomain(const CDomain & domain);       // Not implemented yet.
          CDomain(const CDomain * const domain); // Not implemented yet.
-       
+         static void releaseStaticAllocation(void) ; // release static allocation on heap
+
          static CDomain* createDomain();
          static CDomain* get(const string& id, bool noError=false) ; //<! return domain pointer using id

XIOS/dev/dev_ym/XIOS_COUPLING/src/node/scalar.cpp

@@ -32 +32 @@
   { /* Ne rien faire de plus */ }
 
+  void CScalar::releaseStaticAllocation(void)
+  {
+    transformationMapList_.clear() ;
+    CTransformation<CScalar>::unregisterAllTransformations() ;
+    CGridTransformationFactory<CScalar>::unregisterAllTransformations() ;
+  }
+  
   std::map<StdString, ETranformationType> CScalar::transformationMapList_ = std::map<StdString, ETranformationType>();
   bool CScalar::dummyTransformationMapList_ = CScalar::initializeTransformationMap(CScalar::transformationMapList_);

XIOS/dev/dev_ym/XIOS_COUPLING/src/node/scalar.hpp

@@ -20 +20 @@
 #include "distribution_type.hpp"
 #include "generic_algorithm_transformation.hpp"
+#include "grid_transformation_factory_impl.hpp"
 
 
@@ -67 +68 @@
       CScalar(const CScalar & var);       // Not implemented yet.
       CScalar(const CScalar * const var); // Not implemented yet.
-
+      static void releaseStaticAllocation(void) ; // release static allocation on heap
+      
       /// Destructeur ///
       virtual ~CScalar(void);