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

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/manager

Files:

• pool_ressource.cpp (modified) (2 diffs)
• pool_ressource.hpp (modified) (1 diff)
• server_context.cpp (modified) (1 diff)
• server_context.hpp (modified) (1 diff)
• servers_ressource.cpp (modified) (2 diffs)
• servers_ressource.hpp (modified) (1 diff)
• services.cpp (modified) (3 diffs)
• services.hpp (modified) (1 diff)

XIOS/dev/dev_ym/XIOS_COUPLING/src/manager/pool_ressource.cpp

@@ -118 +118 @@
       if (it->second->eventLoop(serviceOnly))
       {
+        delete it->second ;
         services_.erase(it) ;
         // don't forget to free service later
@@ -196 +197 @@
     finalizeSignal_=true ;
     for (auto it=services_.begin(); it!=services_.end() ; ++it) it->second->finalizeSignal() ;
-  }
-
+  }  
+  
+  CPoolRessource::~CPoolRessource()
+  {
+    delete winNotify_ ;
+    for(auto& service : services_) delete service.second ;
+  }
 }

XIOS/dev/dev_ym/XIOS_COUPLING/src/manager/pool_ressource.hpp

@@ -23 +23 @@
    public:
     CPoolRessource(MPI_Comm poolComm, const std::string& Id) ;
+    ~CPoolRessource() ;
     
     void createService(const std::string& serviceId, int type, int size, int nbPartition) ;

XIOS/dev/dev_ym/XIOS_COUPLING/src/manager/server_context.cpp

@@ -54 +54 @@
   CServerContext::~CServerContext()
   {
-
+    cout<<"Server Context destructor"<<endl;
   } 
 

XIOS/dev/dev_ym/XIOS_COUPLING/src/manager/server_context.hpp

@@ -19 +19 @@
                   const int& partitionId, const std::string& contextId) ;
     ~CServerContext() ;
+    static void releaseStaticAllocation(void) { overlapedComm_.clear() ;}
 
     bool createIntercomm(const string& poolId, const string& serviceId, const int& partitionId, const string& contextId, 

XIOS/dev/dev_ym/XIOS_COUPLING/src/manager/servers_ressource.cpp

@@ -131 +131 @@
       if (poolRessource_->eventLoop(serviceOnly))
       {
+        delete poolRessource_ ;
         poolRessource_=nullptr ;
         // don't forget to free pool ressource later
@@ -188 +189 @@
     else return false ;
   }
+
+  CServersRessource::~CServersRessource()
+  {
+    delete winNotify_ ;
+  }
 }

XIOS/dev/dev_ym/XIOS_COUPLING/src/manager/servers_ressource.hpp

@@ -24 +24 @@
     
     CServersRessource(MPI_Comm serverComm) ;
+    ~CServersRessource() ;
     void createPool(const string& poolId, const int size) ;
     void createPool(void) ;

XIOS/dev/dev_ym/XIOS_COUPLING/src/manager/services.cpp

@@ -42 +42 @@
     name_= poolId+"::"+serviceId+"_"+oss.str();
   }
+
+  CService::~CService()
+  {
+    delete eventScheduler_ ;
+    delete winNotify_ ;
+    for(auto& it : contexts_) delete it.second ;
+  }
+
 
   void CService::createContext( const std::string& poolId, const std::string& serviceId, const int& partitionId, const std::string& contextId)
@@ -121 +129 @@
       if (it->second->eventLoop(serviceOnly))
       {
+        delete it->second ; 
         contexts_.erase(it) ;
         // destroy server_context -> to do later
@@ -235 +244 @@
      auto& arg=notifyInCreateContext_ ;
      string poolId = get<0>(arg) ;
-     string& serviceId = get<1>(arg) ;
+     string serviceId = get<1>(arg) ;
      int partitionId = get<2>(arg) ;
      string contextId = get<3>(arg) ;
-     contexts_[contextId] = new CServerContext(this, serviceComm_, poolId, serviceId, partitionId, contextId) ; 
+     contexts_[contextId] = new CServerContext(this, serviceComm_, poolId, serviceId, partitionId, contextId) ;
    }
 

XIOS/dev/dev_ym/XIOS_COUPLING/src/manager/services.hpp

@@ -21 +21 @@
     CService(MPI_Comm serviceComm, const std::string& poolId, const std::string& serviceId, const int& partitionId, 
              int type, int nbPartitions) ;
+    ~CService() ;
+
     bool eventLoop(bool serviceOnly=false) ;
     void createContext(const std::string& poolId, const std::string& serviceId, const int& partitionId, const std::string& contextId) ;