Changeset 2269 for XIOS/dev/dev_ym/XIOS_COUPLING/extern/remap/src/node.cpp

Timestamp:

12/07/21 12:00:23 (3 years ago)

Author:

ymipsl

Message:

• Solve memory leak from remapper.
• shared_ptr add add for manage nodes.

YM

File:

• XIOS/dev/dev_ym/XIOS_COUPLING/extern/remap/src/node.cpp (modified) (15 diffs)

XIOS/dev/dev_ym/XIOS_COUPLING/extern/remap/src/node.cpp

@@ -79 +79 @@
 /* On level `level` find the node in our subtree that is closest to `src` and return through argument `closest`.
    The return value is just for recursive calling */
-void Node::findClosest(int level, NodePtr src, double& minDist2, NodePtr &closest)
+void Node::findClosest(int level, NodePtr src, double& minDist2, NodePtr& closest)
 {
         double r2;
@@ -89 +89 @@
                 {
                         minDist2 = r2;
-                        closest = this;
+                        closest = shared_from_this();
                 }
         }
@@ -221 +221 @@
 }*/
 
-bool find_in_tree1(Node* node)
+bool find_in_tree1(NodePtr node)
 {
         if (node == node->tree->root) return true;
-        if (node->parent == NULL)
+        if (node->parent.lock() == NULL)
         {
                 cerr << "Cannot find!" << endl;
                 return false;
         }
-        return find_in_tree1(node->parent);
+        return find_in_tree1(node->parent.lock());
 }
 
@@ -264 +264 @@
         {
     node->child.push_back(thIs);
-                thIs->parent = node;
+                thIs->parent = node ;
                 if (node->child.size() > MAX_NODE_SZ &&  node->tree->canSplit() ) // with us as additional child `node` is now too large :(
-                        return (node->reinserted || node->parent == NULL) ? split(node) : reinsert(node);
+                        return (node->reinserted || node->parent.lock() == NULL) ? split(node) : reinsert(node);
         }
         else // la < lb - 1
@@ -299 +299 @@
   
         /* transfere out children from us to a new node q which will be returned */
-        NodePtr q = new Node;
+        NodePtr q = make_shared<Node>();
         q->tree = thIs->tree;
         q->child.resize(out);
@@ -462 +462 @@
 {
         thIs->tree->increaseLevelSize(thIs->level);
-        NodePtr p = new Node;
-        NodePtr q = new Node;
+        NodePtr p = make_shared<Node>();
+        NodePtr q = make_shared<Node>();
         p->level = q->level = thIs->level;
         p->reinserted = q->reinserted = false;
-        p->parent = q->parent = thIs->parent;
+        p->parent = thIs->parent;
+        q->parent = thIs->parent;
         p->tree = q->tree = thIs->tree;
 
@@ -476 +477 @@
         std::sort(thIs->child.begin(), thIs->child.end(), compareDist);
         for (int i = 0; i < MAX_NODE_SZ+1; i++)
-                assert(thIs->child[i]->parent == thIs);
+                assert(thIs->child[i]->parent.lock() == thIs);
         for (int i = 0; i < MAX_NODE_SZ/2 + 1; i++)
                 q->child[i] = thIs->child[i];
@@ -496 +497 @@
         thIs->reinserted = p->reinserted;
         thIs->update();
-        delete p;
+        p.reset();
 
         if (thIs == thIs->tree->root) // root split
@@ -593 +594 @@
   
   for (int i = 0; i < childSize; i++)
-                assert(child[i]->parent == this);
+                assert(child[i]->parent.lock() == shared_from_this());
 
   if (level>0) for (int i = 0; i < childSize; i++) child[i]->checkParent() ;
@@ -602 +603 @@
         cout << "level " << this->level << ", centre ";
         cout << "level " << this->level << ", centre " << this->centre << "\t r = " << this->radius << endl;
-        cout << this << " p: " << this->parent << endl;
+        cout << this << " p: " << this->parent.lock() << endl;
         int n = this->child.size();
         for (int i=0; i<n; i++)
@@ -656 +657 @@
         double distMin2 = 0; // squared distance
         closest = NULL;
-        if (tree->root == this)
+        if (tree->root == shared_from_this())
                 findClosest(level, node, distMin2, closest);
 
-        if (closest != NULL && tree->root == this)
+        if (closest != NULL && tree->root == shared_from_this())
                 /* When is this point reached?
                    if the preceeding findClosest was called and succesed to set closest
@@ -690 +691 @@
 }
 
-void Node::routingIntersecting(vector<Node> *routingList, NodePtr node)
+void Node::routingIntersecting(vector<NodePtr> *routingList, NodePtr node)
 {
         if (level==0)
         {
                 int rank = route;
-                routingList[rank].push_back(*node);
+                routingList[rank].push_back(node);
         }
         else
@@ -712 +713 @@
                 child[i]->free_descendants();
                 if (child[i]->level) // do not attempt to delete leafs, they are delete through leafs vector
-                        delete child[i];
+                        child[i].reset();
         }
 }
@@ -718 +719 @@
 void Node::getNodeLevel(int assignLevel, std::list<NodePtr>& NodeList)
 {
-  if (level==assignLevel) NodeList.push_back(this) ;
+  if (level==assignLevel) NodeList.push_back(shared_from_this()) ;
   else if (level>0) for (int i = 0; i < child.size(); i++) child[i]->getNodeLevel(assignLevel,NodeList) ;
   return ;
@@ -737 +738 @@
         for (int j = 0; j < child[i]->child.size(); j++) tree->push_back(child[i]->child[j]) ;
         tree->decreaseLevelSize(assignLevel) ;
-        delete child[i] ;
+        child[i].reset() ;
       }
       else newChild.push_back(child[i]) ;