Changeset 2274 for XIOS/dev/dev_ym/XIOS_COUPLING/src/node/context.cpp

Timestamp:

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

Author:

ymipsl

Message:

Tracking memory leak : release memory statically alocated

YM

File:

• XIOS/dev/dev_ym/XIOS_COUPLING/src/node/context.cpp (modified) (6 diffs)

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();
       }