Changeset 2267 for XIOS/dev/dev_ym/XIOS_COUPLING/src/distribution/gatherer_connector.hpp

Timestamp:

12/01/21 16:52:24 (3 years ago)

Author:

ymipsl

Message:

tracking memory leak
Elements, views, and connectors are now managed with shared pointer.
YM

File:

• XIOS/dev/dev_ym/XIOS_COUPLING/src/distribution/gatherer_connector.hpp (modified) (5 diffs)

XIOS/dev/dev_ym/XIOS_COUPLING/src/distribution/gatherer_connector.hpp

@@ -17 +17 @@
   {
     private:
-      CDistributedView* srcView_;
-      CLocalView* dstView_;
+      shared_ptr<CDistributedView> srcView_;
+      shared_ptr<CLocalView> dstView_;
       map<int, vector<int>> connector_ ;
       map<int, vector<bool>> mask_ ;  // mask is on src view
@@ -25 +25 @@
 
     public:
-      CGathererConnector(CDistributedView* srcView, CLocalView* dstView) : srcView_(srcView), dstView_(dstView) {} ;
+      CGathererConnector(shared_ptr<CDistributedView> srcView, shared_ptr<CLocalView> dstView) : srcView_(srcView), dstView_(dstView) {} ;
       void computeConnector(void) ;
       
@@ -75 +75 @@
 
       template<typename T>
-      void transfer(int rank,  CGathererConnector** connectors, int nConnectors, const T* input, T* output)
+      void transfer(int rank,  shared_ptr<CGathererConnector>* connectors, int nConnectors, const T* input, T* output)
       {
         auto& connector = connector_[rank] ; // probably costly, find a better way to avoid the map
@@ -111 +111 @@
 
       // hook for transfering mask in grid connector, maybe find an other way to doing that...
-      void transfer_or(int rank,  CGathererConnector** connectors, int nConnectors, const bool* input, bool* output)
+      void transfer_or(int rank,  shared_ptr<CGathererConnector>* connectors, int nConnectors, const bool* input, bool* output)
       {
         auto& connector = connector_[rank] ; // probably costly, find a better way to avoid the map
@@ -210 +210 @@
       }
 
-    int getSrcSliceSize(int rank, CGathererConnector** connectors, int nConnectors) 
+    int getSrcSliceSize(int rank, shared_ptr<CGathererConnector>* connectors, int nConnectors) 
     { if (nConnectors==0) return srcSize_[rank] ; else return srcSize_[rank] * (*(connectors-1))->getSrcSliceSize(rank, connectors-1,nConnectors-1) ; }
 
-    int getDstSliceSize(CGathererConnector** connectors, int nConnectors) 
+    int getDstSliceSize(shared_ptr<CGathererConnector>* connectors, int nConnectors) 
     { if (nConnectors==0) return dstSize_ ; else return dstSize_ * (*(connectors-1))->getDstSliceSize(connectors-1,nConnectors-1) ; }