Changeset 2580 for XIOS3/trunk/src/manager

Timestamp:

09/26/23 17:24:35 (10 months ago)

Author:

ymipsl

Message:

Tracking unfree MPI windows and communicators.

YM

Location:

XIOS3/trunk/src/manager

Files:

• contexts_manager.cpp (modified) (1 diff)
• coupler_manager.cpp (modified) (1 diff)
• pool_ressource.cpp (modified) (2 diffs)
• ressources_manager.cpp (modified) (2 diffs)
• ressources_manager.hpp (modified) (2 diffs)
• server_context.cpp (modified) (6 diffs)
• servers_ressource.cpp (modified) (3 diffs)
• services.cpp (modified) (2 diffs)
• services_manager.cpp (modified) (1 diff)
• window_base.cpp (modified) (2 diffs)
• window_base.hpp (modified) (3 diffs)
• window_manager.hpp (modified) (1 diff)

XIOS3/trunk/src/manager/contexts_manager.cpp

@@ -26 +26 @@
 
     MPI_Comm_rank(xiosComm_, &commRank) ;
-    winNotify_ = new CWindowManager(xiosComm_, maxBufferSize_) ;
+    winNotify_ = new CWindowManager(xiosComm_, maxBufferSize_,"CContextsManager::winNotify_") ;
     winNotify_->updateToExclusiveWindow(commRank, this, &CContextsManager::notificationsDumpOut) ;
    
 
-    winContexts_ = new CWindowManager(xiosComm_, maxBufferSize_) ;
+    winContexts_ = new CWindowManager(xiosComm_, maxBufferSize_,"CContextsManager::winContexts_") ;
     winContexts_->updateToExclusiveWindow(commRank, this, &CContextsManager::contextsDumpOut) ;
   

XIOS3/trunk/src/manager/coupler_manager.cpp

@@ -19 +19 @@
     MPI_Comm_rank(xiosComm_, &commRank) ;
     
-    winRegistredCoupling_ = new CWindowManager(xiosComm_, maxBufferSize_) ;
-    winNextCoupling_ = new CWindowManager(xiosComm_, maxBufferSize_) ;
+    winRegistredCoupling_ = new CWindowManager(xiosComm_, maxBufferSize_,"CCouplerManager::winRegistredCoupling_") ;
+    winNextCoupling_ = new CWindowManager(xiosComm_, maxBufferSize_,"CCouplerManager::winNextCoupling_") ;
     if (commRank==managerGlobalLeader_)
     {

XIOS3/trunk/src/manager/pool_ressource.cpp

@@ -16 +16 @@
     int commRank, commSize ;
     MPI_Comm_dup(poolComm, &poolComm_) ;
-    winNotify_ = new CWindowManager(poolComm_, maxBufferSize_) ;
+    CXios::getMpiGarbageCollector().registerCommunicator(poolComm_) ;
+    winNotify_ = new CWindowManager(poolComm_, maxBufferSize_,"CPoolRessource::winNotify_") ;
     MPI_Comm_rank(poolComm, &commRank) ;
     MPI_Comm_size(poolComm, &commSize) ;
@@ -404 +405 @@
         MPI_Comm newServiceComm ;
         MPI_Comm_dup(serviceComm, &newServiceComm) ;
+        CXios::getMpiGarbageCollector().registerCommunicator(newServiceComm) ;
         int nbPartitions = service.second->getNbPartitions() ;
         int partitionId = service.second->getPartitionId() ;

XIOS3/trunk/src/manager/ressources_manager.cpp

@@ -22 +22 @@
     if (commRank==0 && isXiosServer) MPI_Comm_rank(xiosComm_, &commRank) ; 
     else commRank=0 ;
-    tokenManager_ = new CTokenManager(xiosComm_,commRank) ;
+    //tokenManager_ = new CTokenManager(xiosComm_,commRank) ;
 
     MPI_Allreduce(&commRank, &managerGlobalLeader_, 1, MPI_INT, MPI_SUM, xiosComm_) ;
 
     MPI_Comm_rank(xiosComm_, &commRank) ;
-    winNotify_ = new CWindowManager(xiosComm_, maxBufferSize_) ;
-   
-
-    winRessources_ = new CWindowManager(xiosComm_, maxBufferSize_) ;
+    winNotify_ = new CWindowManager(xiosComm_, maxBufferSize_,"CRessourcesManager::winNotify_") ;
+   
+
+    winRessources_ = new CWindowManager(xiosComm_, maxBufferSize_,"CRessourcesManager::winRessources_") ;
     winRessources_->lockWindow(commRank,0) ;
     serverLeader_=-1 ;
@@ -43 +43 @@
     delete winNotify_ ;
     delete winRessources_ ;
-    delete tokenManager_ ;
+    //delete tokenManager_ ;
   } 
 

XIOS3/trunk/src/manager/ressources_manager.hpp

@@ -59 +59 @@
     void registerPoolClient(const std::string& poolId,int size,int leader) ;
     void registerPoolServer(const std::string& poolId,int size,int leader) ;
-    CTokenManager* getTokenManager(void) {return tokenManager_ ;} 
+    //CTokenManager* getTokenManager(void) {return tokenManager_ ;} 
 
     int managerGlobalLeader_ ;
@@ -66 +66 @@
 
     CWindowManager* winNotify_ ;
-    CTokenManager* tokenManager_ ;
+    //CTokenManager* tokenManager_ ;
 
     const size_t maxBufferSize_=1024*1024 ;

XIOS3/trunk/src/manager/server_context.cpp

@@ -24 +24 @@
 
     MPI_Comm_dup(contextComm, &contextComm_) ;
+    CXios::getMpiGarbageCollector().registerCommunicator(contextComm_) ;
     xiosComm_=CXios::getXiosComm() ;
   
@@ -29 +30 @@
     MPI_Comm_rank(contextComm_,&localRank) ;
  
-    winNotify_ = new CWindowManager(contextComm_, maxBufferSize_) ;
+    winNotify_ = new CWindowManager(contextComm_, maxBufferSize_,"CServerContext::winNotify_") ;
     MPI_Barrier(contextComm_) ;
     
@@ -57 +58 @@
   CServerContext::~CServerContext()
   {
+    delete winNotify_ ;
     cout<<"Server Context destructor"<<endl;
   } 
@@ -126 +128 @@
       { 
         MPI_Intercomm_create(intraComm, 0, xiosComm_, contextLeader, 3141, &interCommClient) ;
+        CXios::getMpiGarbageCollector().registerCommunicator(interCommClient) ;
         MPI_Comm_dup(interCommClient, &interCommServer) ;
+        CXios::getMpiGarbageCollector().registerCommunicator(interCommServer) ;
         MPI_Comm_free(&newInterCommClient) ;
         MPI_Comm_free(&newInterCommServer) ;
@@ -315 +319 @@
       info(10)<<"CServerContext::createIntercomm : No overlap ==> context in server mode"<<endl ;
       MPI_Intercomm_create(contextComm_, 0, xiosComm_, remoteLeader, 3141, &interCommServer) ;
+      CXios::getMpiGarbageCollector().registerCommunicator(interCommServer) ;
       MPI_Comm_dup(interCommServer,&interCommClient) ;
+      CXios::getMpiGarbageCollector().registerCommunicator(interCommClient) ;
       context_ -> createClientInterComm(interCommClient,interCommServer) ;
       clientsInterComm_.push_back(interCommClient) ;
@@ -329 +335 @@
   void CServerContext::freeComm(void)
   {
-    delete winNotify_ ;
-    winNotify_=nullptr ;
-    MPI_Comm_free(&contextComm_) ;
+    //delete winNotify_ ;
+    //winNotify_=nullptr ;
+    //MPI_Comm_free(&contextComm_) ;
     // don't forget intercomm -> later
   }

XIOS3/trunk/src/manager/servers_ressource.cpp

@@ -23 +23 @@
 
     MPI_Comm_dup(serverComm, &serverComm_) ;
+    CXios::getMpiGarbageCollector().registerCommunicator(serverComm_) ; 
     MPI_Comm xiosComm=CXios::getXiosComm() ;
   
@@ -29 +30 @@
     MPI_Comm_rank(serverComm_,&localRank) ;
     
-    winNotify_ = new CWindowManager(serverComm_, maxBufferSize_) ;
+    winNotify_ = new CWindowManager(serverComm_, maxBufferSize_,"CServersRessource::winNotify_") ;
     MPI_Barrier(serverComm_) ;
     if (localRank==localLeader_) 
@@ -42 +43 @@
 
     MPI_Comm_dup(serverComm_, &freeRessourcesComm_) ; 
+    CXios::getMpiGarbageCollector().registerCommunicator(freeRessourcesComm_) ;
     eventScheduler_ = make_shared<CEventScheduler>(freeRessourcesComm_) ;
     freeRessourceEventScheduler_ = eventScheduler_ ;

XIOS3/trunk/src/manager/services.cpp

@@ -22 +22 @@
 
     MPI_Comm_dup(serviceComm, &serviceComm_) ;
+    CXios::getMpiGarbageCollector().registerCommunicator(serviceComm_) ;
     MPI_Comm globalComm_=CXios::getXiosComm() ;
   
@@ -27 +28 @@
     MPI_Comm_rank(serviceComm_,&localRank) ;
     
-    winNotify_ = new CWindowManager(serviceComm_, maxBufferSize_) ;
+    winNotify_ = new CWindowManager(serviceComm_, maxBufferSize_,"CService::winNotify_") ;
     winNotify_->updateToExclusiveWindow(localRank, this, &CService::createContextDumpOut) ;
     MPI_Barrier(serviceComm_) ;

XIOS3/trunk/src/manager/services_manager.cpp

@@ -30 +30 @@
 
     MPI_Comm_rank(xiosComm_, &commRank) ;
-    winNotify_ = new CWindowManager(xiosComm_, maxBufferSize_) ;
+    winNotify_ = new CWindowManager(xiosComm_, maxBufferSize_,"CServicesManager::winNotify_") ;
     winNotify_->updateToExclusiveWindow(commRank, this, &CServicesManager::notificationsDumpOut) ;
 
-    winServices_ = new CWindowManager(xiosComm_, maxBufferSize_) ;
+    winServices_ = new CWindowManager(xiosComm_, maxBufferSize_,"CServicesManager::winServices_") ;
     winServices_->updateToExclusiveWindow(commRank, this, &CServicesManager::servicesDumpOut) ;
    

XIOS3/trunk/src/manager/window_base.cpp

@@ -4 +4 @@
 namespace xios
 {
-    CWindowBase::CWindowBase(MPI_Comm winComm, size_t bufferSize)
+    CWindowBase::CWindowBase(MPI_Comm winComm, size_t bufferSize, const string name)  : name_(name)
     {
       bufferSize_ = bufferSize ;
@@ -13 +13 @@
       lock=0 ;
       MPI_Win_lock_all(0, window_) ;
+      info(100)<<"CWindowBase constructor : "<<name_<<endl ;
       MPI_Barrier(winComm) ;
     }

XIOS3/trunk/src/manager/window_base.hpp

@@ -3 +3 @@
 
 #include <map>
+#include <string>
+
 #include "exception.hpp"
 #include "mpi.hpp"
+#include <string>
 
 namespace xios
@@ -21 +24 @@
       const double maxLatency_ = 1e-3 ; // 1ms latency maximum
       MPI_Win window_ ;
+      std::string name_ ;
 
     public :
 
-    CWindowBase(MPI_Comm winComm, size_t bufferSize);
+    CWindowBase(MPI_Comm winComm, size_t bufferSize, const string name);
 
     bool tryLockExclusive(int rank)
@@ -143 +147 @@
     {
       MPI_Win_unlock_all(window_);
+      info(100)<<"CWindowBase destructor : "<<name_<<endl ;
     }
 

XIOS3/trunk/src/manager/window_manager.hpp

@@ -31 +31 @@
     public :
 
-    CWindowManager(MPI_Comm winComm, size_t bufferSize) : CWindowBase(winComm, bufferSize + OFFSET_BUFFER_SIZE)
+    CWindowManager(MPI_Comm winComm, size_t bufferSize, const string name) : CWindowBase(winComm, bufferSize + OFFSET_BUFFER_SIZE, name)
     {
       int lock=0 ;