Changeset 2267 for XIOS/dev/dev_ym/XIOS_COUPLING/src/node/axis.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/node/axis.hpp (modified) (3 diffs)

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

@@ -222 +222 @@
          
         private:
-         CLocalElement* localElement_ = nullptr ;
+         shared_ptr<CLocalElement> localElement_ ;
          void initializeLocalElement(void) ;
         public: 
-         CLocalElement* getLocalElement(void) { if (localElement_==nullptr) initializeLocalElement() ; return localElement_ ; }
-         CLocalView* getLocalView(CElementView::type type) { return getLocalElement()->getView(type) ;}
+         shared_ptr<CLocalElement> getLocalElement(void) { if (localElement_==nullptr) initializeLocalElement() ; return localElement_ ; }
+         shared_ptr<CLocalView> getLocalView(CElementView::type type) { return getLocalElement()->getView(type) ;}
         private:
          void addFullView(void) ;
@@ -233 +233 @@
 
         private:
-         CLocalConnector* modelToWorkflowConnector_ ;
+         shared_ptr<CLocalConnector> modelToWorkflowConnector_ ;
          void computeModelToWorkflowConnector(void)  ;
         public:
-         CLocalConnector* getModelToWorkflowConnector(void) { if (modelToWorkflowConnector_==nullptr) computeModelToWorkflowConnector() ; return modelToWorkflowConnector_ ;}
+         shared_ptr<CLocalConnector> getModelToWorkflowConnector(void) { if (modelToWorkflowConnector_==nullptr) computeModelToWorkflowConnector() ; return modelToWorkflowConnector_ ;}
        
        public:
          void computeRemoteElement(CContextClient* client, EDistributionType) ;
-         void distributeToServer(CContextClient* client, std::map<int, CArray<size_t,1>>& globalIndex, CScattererConnector* &scattererConnector,
+         void distributeToServer(CContextClient* client, std::map<int, CArray<size_t,1>>& globalIndex, shared_ptr<CScattererConnector>& scattererConnector,
                                  const string& axisId="") ;
 
@@ -246 +246 @@
          void receivedAxisDistribution(CEventServer& event, int phasis) ;
          void setServerMask(CArray<bool,1>& serverMask, CContextClient* client ) ;
-         void sendDistributedAttributes(CContextClient* client, CScattererConnector& scattererConnector, const string& axisId) ;
+         void sendDistributedAttributes(CContextClient* client, shared_ptr<CScattererConnector> scattererConnector, const string& axisId) ;
          static void recvDistributedAttributes(CEventServer& event) ;
          void recvDistributedAttributes(CEventServer& event, const string& type) ;
        private:
-         map<CContextClient*, CDistributedElement*> remoteElement_ ;
-       public: 
-         CDistributedElement* getRemoteElement(CContextClient* client) {return remoteElement_[client] ;}
-       private:
-         map<CContextClient*, CScattererConnector*> clientToServerConnector_ ;
-       public: 
-         CScattererConnector* getClientToServerConnector(CContextClient* client) { return clientToServerConnector_[client] ;}
-       private:
-         CGathererConnector*  gathererConnector_ ;
+         map<CContextClient*, shared_ptr<CDistributedElement>> remoteElement_ ;
+       public: 
+         shared_ptr<CDistributedElement> getRemoteElement(CContextClient* client) {return remoteElement_[client] ;}
+       private:
+         map<CContextClient*, shared_ptr<CScattererConnector>> clientToServerConnector_ ;
+       public: 
+         shared_ptr<CScattererConnector> getClientToServerConnector(CContextClient* client) { return clientToServerConnector_[client] ;}
+       private:
+         shared_ptr<CGathererConnector>  gathererConnector_ ;
        public:
-         CGathererConnector* getGathererConnector(void) { return gathererConnector_ ;}
-       private:
-         CGathererConnector* serverFromClientConnector_ ;
-         CDistributedElement* elementFrom_ ;
+         shared_ptr<CGathererConnector> getGathererConnector(void) { return gathererConnector_ ;}
+       private:
+         shared_ptr<CGathererConnector> serverFromClientConnector_ ;
+         shared_ptr<CDistributedElement> elementFrom_ ;
        public:
-        CGathererConnector* getServerFromClientConnector(void) { return serverFromClientConnector_ ;}
-
-       private:
-         CScattererConnector*  serverToClientConnector_ = nullptr ;
-       public: 
-         CScattererConnector* getServerToClientConnector(void) { return serverToClientConnector_ ;} 
-
-       private:
-          map<CContextClient*,CGathererConnector*>  clientFromServerConnector_  ;
-       public: 
-         CGathererConnector* getClientFromServerConnector(CContextClient* client) { return clientFromServerConnector_[client] ;} 
+        shared_ptr<CGathererConnector> getServerFromClientConnector(void) { return serverFromClientConnector_ ;}
+
+       private:
+         shared_ptr<CScattererConnector> serverToClientConnector_ = nullptr ;
+       public: 
+         shared_ptr<CScattererConnector> getServerToClientConnector(void) { return serverToClientConnector_ ;} 
+
+       private:
+          map<CContextClient*,shared_ptr<CGathererConnector>>  clientFromServerConnector_  ;
+       public: 
+        shared_ptr<CGathererConnector> getClientFromServerConnector(CContextClient* client) { return clientFromServerConnector_[client] ;} 
 
          DECLARE_REF_FUNC(Axis,axis)