Changeset 2569

Timestamp:

09/14/23 14:55:37 (16 months ago)

Author:

jderouillat

Message:

Clean memory associated to EventScheduler? hierarchy and MpiGarbageCollector?

Location:

XIOS3/trunk/src

Files:

• event_scheduler.cpp (modified) (1 diff)
• event_scheduler.hpp (modified) (1 diff)
• mpi_garbage_collector.hpp (modified) (1 diff)

XIOS3/trunk/src/event_scheduler.cpp

@@ -92 +92 @@
       checkEvent_() ;
     } 
+    cleanSplitSchedulers();
+  }
+    
+  void CEventScheduler::cleanSplitSchedulers()
+  {
+    // Cleaning is operated recursively going from parent to child
+    if (parentScheduler_)
+    {
+      if (parentScheduler_->childScheduler_.get() == this)
+      {
+        parentScheduler_.reset();
+      }
+      else // if orphan (due to splitScheduler) : clean parent tree (it does not have child)
+      {
+        parentScheduler_->cleanSplitSchedulers();
+        parentScheduler_.reset();
+      }
+    }                   
+    if (childScheduler_)
+    {
+      childScheduler_->cleanSplitSchedulers();
+      childScheduler_.reset();
+    }
   } 
 

XIOS3/trunk/src/event_scheduler.hpp

@@ -71 +71 @@
        private:
          void initialize(const MPI_Comm& comm) ;
+         void cleanSplitSchedulers();
        
        //! Send an event to the parent of level `lev+1`

XIOS3/trunk/src/mpi_garbage_collector.hpp

@@ -27 +27 @@
           if (it.type==SType::COMM) MPI_Comm_free(&it.comm);
           else if (it.type==SType::WIN) MPI_Win_free(&it.win);
+        stack_.clear();
       }
   } ;