Changeset 2267 for XIOS/dev/dev_ym/XIOS_COUPLING/src/node/grid.cpp

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/grid.cpp (modified) (17 diffs)

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

@@ -1429 +1429 @@
     if (posDistributed==elements.size()) posDistributed=0 ; // grid composed only of scalar
     
-    vector<CLocalView*> localViews ;
-    vector<CLocalView*> workflowView ;
-    vector<CDistributedView*> remoteViews ;
+    vector<shared_ptr<CLocalView>> localViews ;
+    vector<shared_ptr<CLocalView>> workflowView ;
+    vector<shared_ptr<CDistributedView>> remoteViews ;
 
     for(int i=0 ; i<elements.size() ; i++)
@@ -1462 +1462 @@
     
     // CGridClientServerRemoteConnector : workflowView is added to avoid spurious optimisation with only the fullview
-    CGridClientServerRemoteConnector gridRemoteConnector(localViews, workflowView, remoteViews, context->getIntraComm(), client->getRemoteSize()) ;
-    gridRemoteConnector.computeConnector() ;
+    auto gridRemoteConnector = make_shared<CGridClientServerRemoteConnector>(localViews, workflowView, remoteViews, context->getIntraComm(), client->getRemoteSize()) ;
+    gridRemoteConnector->computeConnector() ;
     
-    vector<CScattererConnector*> scattererConnectors ;
-    CScattererConnector* scattererConnector;
+    vector<shared_ptr<CScattererConnector>> scattererConnectors ;
+    shared_ptr<CScattererConnector> scattererConnector;
     for(int i=0 ; i<elements.size() ; i++)
     {
@@ -1472 +1472 @@
       { 
         CDomain* domain = (CDomain*) elements[i].ptr ;
-        if (isCoupling) domain->distributeToServer(client, gridRemoteConnector.getDistributedGlobalIndex(i), scattererConnector,  domain->getCouplingAlias(fieldId,i)) ;
+        if (isCoupling) domain->distributeToServer(client, gridRemoteConnector->getDistributedGlobalIndex(i), scattererConnector,  domain->getCouplingAlias(fieldId,i)) ;
         else 
         {
           sendAddDomain(domain->getId(),client) ;
-          domain->distributeToServer(client, gridRemoteConnector.getDistributedGlobalIndex(i), scattererConnector) ;
+          domain->distributeToServer(client, gridRemoteConnector->getDistributedGlobalIndex(i), scattererConnector) ;
         }
         scattererConnectors.push_back(scattererConnector) ;
@@ -1483 +1483 @@
       {
         CAxis* axis = (CAxis*) elements[i].ptr ;
-        if (isCoupling) axis->distributeToServer(client, gridRemoteConnector.getDistributedGlobalIndex(i), scattererConnector,  axis->getCouplingAlias(fieldId,i)) ;
+        if (isCoupling) axis->distributeToServer(client, gridRemoteConnector->getDistributedGlobalIndex(i), scattererConnector,  axis->getCouplingAlias(fieldId,i)) ;
         else 
         {
           sendAddAxis(axis->getId(),client) ;
-          axis->distributeToServer(client, gridRemoteConnector.getDistributedGlobalIndex(i), scattererConnector) ;
+          axis->distributeToServer(client, gridRemoteConnector->getDistributedGlobalIndex(i), scattererConnector) ;
         }
         scattererConnectors.push_back(scattererConnector) ;
@@ -1494 +1494 @@
       {
         CScalar* scalar = (CScalar*) elements[i].ptr ;
-        if (isCoupling) scalar->distributeToServer(client, gridRemoteConnector.getDistributedGlobalIndex(i), scattererConnector,  scalar->getCouplingAlias(fieldId,i)) ;
+        if (isCoupling) scalar->distributeToServer(client, gridRemoteConnector->getDistributedGlobalIndex(i), scattererConnector,  scalar->getCouplingAlias(fieldId,i)) ;
         else 
         {
           sendAddScalar(scalar->getId(),client) ;
-          scalar->distributeToServer(client, gridRemoteConnector.getDistributedGlobalIndex(i), scattererConnector) ;
+          scalar->distributeToServer(client, gridRemoteConnector->getDistributedGlobalIndex(i), scattererConnector) ;
         }
         scattererConnectors.push_back(scattererConnector) ;
@@ -1504 +1504 @@
     }
 
-    CGridScattererConnector gridScattererConnector(scattererConnectors) ;
-    CGridLocalConnector* workflowToFull = getGridLocalElements()->getConnector(CElementView::WORKFLOW, CElementView::FULL) ;
+    auto gridScattererConnector = make_shared<CGridScattererConnector>(scattererConnectors) ;
+    shared_ptr<CGridLocalConnector> workflowToFull = getGridLocalElements()->getConnector(CElementView::WORKFLOW, CElementView::FULL) ;
     CArray<bool,1> maskIn(workflowToFull->getSrcSize()) ;
     CArray<bool,1> maskOut(workflowToFull->getDstSize()) ;
@@ -1515 +1515 @@
     if (isCoupling) message<<getCouplingAlias(fieldId) ;
     else message<<getId() ; 
-    gridScattererConnector.transfer(maskOut, client, event, message) ;
-    for(auto& it : scattererConnectors) delete it ;
-
-    vector<CScattererConnector*> clientToServerConnectors ;
-    vector<CGathererConnector*>  clientFromServerConnectors ;
+    gridScattererConnector->transfer(maskOut, client, event, message) ;
+   
+    vector<shared_ptr<CScattererConnector>> clientToServerConnectors ;
+    vector<shared_ptr<CGathererConnector>>  clientFromServerConnectors ;
     for(auto& element : elements)
     {
@@ -1541 +1540 @@
     
     // compute the grid clientToServerConnector to send flux from client to servers
-    clientToServerConnector_[client] = new CGridScattererConnector(clientToServerConnectors) ;
-    clientFromServerConnector_[client] = new CGridGathererConnector(clientFromServerConnectors) ;
+    clientToServerConnector_[client] = make_shared<CGridScattererConnector>(clientToServerConnectors) ;
+    clientFromServerConnector_[client] = make_shared<CGridGathererConnector>(clientFromServerConnectors) ;
 
   }
@@ -1556 +1555 @@
   void CGrid::receiveMask(CEventServer& event)
   {
-    vector<CGathererConnector*> gathererConnectors ;
-    vector<CLocalView*> fullViews ;
+    vector<shared_ptr<CGathererConnector>> gathererConnectors ;
+    vector<shared_ptr<CLocalView>> fullViews ;
 
     for(auto& element : getElements())
@@ -1578 +1577 @@
       }
     }
-    CGridGathererConnector gridGathererConnector(gathererConnectors) ;
-    CGridMaskConnector gridMaskConnector(fullViews) ;
+    auto gridGathererConnector = make_shared<CGridGathererConnector>(gathererConnectors) ;
+    auto gridMaskConnector = make_shared<CGridMaskConnector>(fullViews) ;
 
     CArray<bool,1> maskOut ;
-    gridGathererConnector.transfer_or(event,maskOut) ;
-    gridMaskConnector.computeConnector(maskOut) ;
+    gridGathererConnector->transfer_or(event,maskOut) ;
+    gridMaskConnector->computeConnector(maskOut) ;
 
     CContextClient* client = event.getContextServer()->getAssociatedClient() ;
@@ -1589 +1588 @@
     for(auto& element : getElements())
     {
-      if (element.type==TYPE_DOMAIN) element.domain->setServerMask(gridMaskConnector.getElementMask(i),client);
-      else if (element.type==TYPE_AXIS) element.axis->setServerMask(gridMaskConnector.getElementMask(i),client);
-      else if (element.type==TYPE_SCALAR) element.scalar->setServerMask(gridMaskConnector.getElementMask(i),client);
+      if (element.type==TYPE_DOMAIN) element.domain->setServerMask(gridMaskConnector->getElementMask(i),client);
+      else if (element.type==TYPE_AXIS) element.axis->setServerMask(gridMaskConnector->getElementMask(i),client);
+      else if (element.type==TYPE_SCALAR) element.scalar->setServerMask(gridMaskConnector->getElementMask(i),client);
       i++ ;
     }
@@ -2310 +2309 @@
     auto axis=axisList.begin() ;
     auto scalar=scalarList.begin() ;
-    vector<CLocalElement*> elements;
+    vector<shared_ptr<CLocalElement>> elements;
     for(auto order : order_)
     {
@@ -2332 +2331 @@
     {
       vector<bool> mask(getMask().getVector()) ;
-      gridLocalElements_ = new CGridLocalElements(elements, mask) ;  
-    }
-    else gridLocalElements_ = new CGridLocalElements(elements) ;  
+      gridLocalElements_ = make_shared<CGridLocalElements>(elements, mask) ;  
+    }
+    else gridLocalElements_ = make_shared<CGridLocalElements>(elements) ;  
   }
 
@@ -2359 +2358 @@
   void CGrid::computeServerFromClientConnector(void)
   {
-    vector<CGathererConnector*> connectors ;
+    vector<shared_ptr<CGathererConnector>> connectors ;
     for(auto& element : getElements())
     {
@@ -2366 +2365 @@
       else if (element.type==TYPE_SCALAR) connectors.push_back(element.scalar->getServerFromClientConnector()) ; 
     }
-    serverFromClientConnector_ = new CGridGathererConnector(connectors) ;
+    serverFromClientConnector_ = make_shared<CGridGathererConnector>(connectors) ;
   }
 
   void CGrid::computeServerToClientConnector(void)
   {
-    vector<CScattererConnector*> connectors ;
+    vector<shared_ptr<CScattererConnector>> connectors ;
     for(auto& element : getElements())
     {
@@ -2378 +2377 @@
       else if (element.type==TYPE_SCALAR) connectors.push_back(element.scalar->getServerToClientConnector()) ; 
     }
-    serverToClientConnector_ = new CGridScattererConnector(connectors) ;
+    serverToClientConnector_ = make_shared<CGridScattererConnector>(connectors) ;
   }
 
   void CGrid::computeClientFromClientConnector(void)
   {
-    vector<CGathererConnector*> connectors ;
+    vector<shared_ptr<CGathererConnector>> connectors ;
     for(auto& element : getElements())
     {
@@ -2390 +2389 @@
       else if (element.type==TYPE_SCALAR) connectors.push_back(element.scalar->getServerFromClientConnector()) ; 
     }
-    clientFromClientConnector_ = new CGridGathererConnector(connectors) ;
+    clientFromClientConnector_ = make_shared<CGridGathererConnector>(connectors) ;
   }