Changeset 2570

Timestamp:

09/18/23 11:12:40 (8 months ago)

Author:

jderouillat

Message:

Memory cleaning of the EventScheduler? hierarchy triggered by the PoolRessource? cleaning through freeRessourceEventScheduler_. Cleaning of MPI_Window associated to services operated through the MpiGarbageCollector?.

Location:

XIOS3/trunk/src

Files:

• event_scheduler.cpp (modified) (1 diff)
• event_scheduler.hpp (modified) (2 diffs)
• manager/pool_ressource.cpp (modified) (1 diff)
• manager/window_base.cpp (modified) (1 diff)
• manager/window_base.hpp (modified) (2 diffs)

XIOS3/trunk/src/event_scheduler.cpp

@@ -92 +92 @@
       checkEvent_() ;
     } 
-    cleanSplitSchedulers();
   }
     

XIOS3/trunk/src/event_scheduler.hpp

@@ -61 +61 @@
        void setChildScheduler(shared_ptr<CEventScheduler> childScheduler) { childScheduler_ = childScheduler ;}
        void splitScheduler(const MPI_Comm& splittedComm, shared_ptr<CEventScheduler>& parent, shared_ptr<CEventScheduler>& child) ;
+       void cleanSplitSchedulers();
 
        //! Public interface to give the hand to the instance to check pending or incoming message.
@@ -71 +72 @@
        private:
          void initialize(const MPI_Comm& comm) ;
-         void cleanSplitSchedulers();
        
        //! Send an event to the parent of level `lev+1`

XIOS3/trunk/src/manager/pool_ressource.cpp

@@ -429 +429 @@
   CPoolRessource::~CPoolRessource()
   {
+    freeRessourceEventScheduler_->cleanSplitSchedulers();
     delete winNotify_ ;
     for(auto& service : services_) delete service.second ;

XIOS3/trunk/src/manager/window_base.cpp

@@ -1 +1 @@
 #include "window_base.hpp"
+#include "cxios.hpp"
 
 namespace xios
 {
+    CWindowBase::CWindowBase(MPI_Comm winComm, size_t bufferSize)
+    {
+      bufferSize_ = bufferSize ;
+      windowSize_ = bufferSize_ + OFFSET_BUFFER ;
+      MPI_Win_allocate(windowSize_, 1, MPI_INFO_NULL, winComm, &winBuffer_, &window_) ;
+      CXios::getMpiGarbageCollector().registerWindow(window_) ;
+      MPI_Aint& lock = *((MPI_Aint*)((char*)winBuffer_+OFFSET_LOCK)) ;
+      lock=0 ;
+      MPI_Win_lock_all(0, window_) ;
+      MPI_Barrier(winComm) ;
+    }
   
   

XIOS3/trunk/src/manager/window_base.hpp

@@ -24 +24 @@
     public :
 
-    CWindowBase(MPI_Comm winComm, size_t bufferSize)
-    {
-      bufferSize_ = bufferSize ;
-      windowSize_ = bufferSize_ + OFFSET_BUFFER ;
-      MPI_Win_allocate(windowSize_, 1, MPI_INFO_NULL, winComm, &winBuffer_, &window_) ;
-      MPI_Aint& lock = *((MPI_Aint*)((char*)winBuffer_+OFFSET_LOCK)) ;
-      lock=0 ;
-      MPI_Win_lock_all(0, window_) ;
-      MPI_Barrier(winComm) ;
-    }
+    CWindowBase(MPI_Comm winComm, size_t bufferSize);
 
     bool tryLockExclusive(int rank)
@@ -152 +143 @@
     {
       MPI_Win_unlock_all(window_);
-      MPI_Win_free(&window_) ;
     }