Changeset 2310

Timestamp:

03/15/22 14:56:16 (2 years ago)

Author:

ymipsl

Message:

Implement small garbage collector for unfreed MPI windows and communicator.

YM

Location:

XIOS/dev/dev_ym/XIOS_COUPLING/src

Files:

• client.cpp (modified) (1 diff)
• context_client.cpp (modified) (1 diff)
• context_server.cpp (modified) (1 diff)
• cxios.cpp (modified) (1 diff)
• cxios.hpp (modified) (3 diffs)
• mpi_garbage_collector.hpp (added)
• server.cpp (modified) (1 diff)

XIOS/dev/dev_ym/XIOS_COUPLING/src/client.cpp

@@ -492 +492 @@
       CContext::removeAllContexts() ; // free memory for related context 
 
-
+      CXios::getMpiGarbageCollector().release() ; // release unfree MPI ressources
       if (!is_MPI_Initialized)
       {

XIOS/dev/dev_ym/XIOS_COUPLING/src/context_client.cpp

@@ -335 +335 @@
         MPI_Intercomm_create(commSelf_, 0, interCommMerged_, clientSize+rank, 0, &interComm) ;
         MPI_Intercomm_merge(interComm, false, &winComm_[rank]) ;
+        CXios::getMpiGarbageCollector().registerCommunicator(winComm_[rank]) ;
         MPI_Comm_free(&interComm) ;
         windows_[rank].resize(2) ;
+        
         MPI_Win_create_dynamic(MPI_INFO_NULL, winComm_[rank], &windows_[rank][0]);
+        CXios::getMpiGarbageCollector().registerWindow(windows_[rank][0]) ;
+        
         MPI_Win_create_dynamic(MPI_INFO_NULL, winComm_[rank], &windows_[rank][1]);   
+        CXios::getMpiGarbageCollector().registerWindow(windows_[rank][1]) ;
+
         CTimer::get("create Windows").suspend() ;
       }

XIOS/dev/dev_ym/XIOS_COUPLING/src/context_server.cpp

@@ -162 +162 @@
         MPI_Intercomm_create(commSelf_, 0, interCommMerged_, rank, 0 , &interComm) ;
         MPI_Intercomm_merge(interComm, true, &winComm_[rank]) ;
+        CXios::getMpiGarbageCollector().registerCommunicator(winComm_[rank]) ;
+        MPI_Comm_free(&interComm) ;
         windows_[rank].resize(2) ;
         MPI_Win_create_dynamic(MPI_INFO_NULL, winComm_[rank], &windows_[rank][0]);
+        CXios::getMpiGarbageCollector().registerWindow(windows_[rank][0]) ;
         MPI_Win_create_dynamic(MPI_INFO_NULL, winComm_[rank], &windows_[rank][1]);
+        CXios::getMpiGarbageCollector().registerWindow(windows_[rank][1]) ;
         CTimer::get("create Windows").suspend() ;
         MPI_Barrier(winComm_[rank]) ;

XIOS/dev/dev_ym/XIOS_COUPLING/src/cxios.cpp

@@ -59 +59 @@
   CRegistryManager*   CXios::registryManager_=nullptr ;
 
+  CMpiGarbageCollector CXios::MpiGarbageCollector_  ;
+
   //! Parse configuration file and create some objects from it
   void CXios::initialize()

XIOS/dev/dev_ym/XIOS_COUPLING/src/cxios.hpp

@@ -11 +11 @@
 #include "coupler_manager.hpp"
 #include "registry_manager.hpp"
+#include "mpi_garbage_collector.hpp"
 
 namespace xios
@@ -75 +76 @@
      static CContextsManager* contextsManager_ ;
      static CDaemonsManager* daemonsManager_ ;
-     
-
+     static CMpiGarbageCollector MpiGarbageCollector_  ;
+    public:
+     static CMpiGarbageCollector& getMpiGarbageCollector(void) { return MpiGarbageCollector_ ; }
     public:
      //! Setting xios to use server mode
@@ -111 +113 @@
      static CDaemonsManager*    getDaemonsManager(void) { return daemonsManager_ ;}
      static CPoolRessource*     getPoolRessource(void) ;
-
+     
      static MPI_Comm getGlobalComm(void) { return globalComm ;}
      static MPI_Comm getXiosComm(void) { return xiosComm ;}

XIOS/dev/dev_ym/XIOS_COUPLING/src/server.cpp

@@ -320 +320 @@
       CContext::removeAllContexts() ; // free memory for related context
           
+      CXios::getMpiGarbageCollector().release() ; // release unfree MPI ressources
+
       if (!is_MPI_Initialized)
       {