Changeset 2517 for XIOS3/trunk/src/manager/services_manager.cpp

Timestamp:

06/12/23 11:52:10 (13 months ago)

Author:

ymipsl

Message:

New way to manage locks in window manager. Windows is locked with MPI_Win_lock_all at creation (shared mode), and lock is manage by software way in the class (using MPI_swap_and_compare and MPI_Fetch_op). We get in this case a better control of lock, with controled latency between each attemp of lock.

YM

File:

• XIOS3/trunk/src/manager/services_manager.cpp (modified) (6 diffs)

XIOS3/trunk/src/manager/services_manager.cpp

@@ -31 +31 @@
     MPI_Comm_rank(xiosComm_, &commRank) ;
     winNotify_ = new CWindowManager(xiosComm_, maxBufferSize_) ;
-    winNotify_->lockWindow(commRank,0) ;
-    winNotify_->updateToWindow(commRank, this, &CServicesManager::notificationsDumpOut) ;
-    winNotify_->unlockWindow(commRank,0) ;
+    winNotify_->updateToExclusiveWindow(commRank, this, &CServicesManager::notificationsDumpOut) ;
 
     winServices_ = new CWindowManager(xiosComm_, maxBufferSize_) ;
-    winServices_->lockWindow(commRank,0) ;
-    winServices_->updateToWindow(commRank, this, &CServicesManager::servicesDumpOut) ;
-    winServices_->unlockWindow(commRank,0) ;
-
+    winServices_->updateToExclusiveWindow(commRank, this, &CServicesManager::servicesDumpOut) ;
+   
     MPI_Barrier(xiosComm_)  ;    
   }
@@ -121 +117 @@
   void CServicesManager::sendNotification(int rank)
   {
-    winNotify_->lockWindowExclusive(rank) ;
-    winNotify_->pushToLockedWindow(rank, this, &CServicesManager::notificationsDumpOut) ;
-    winNotify_->unlockWindow(rank) ;
+    winNotify_->pushToExclusiveWindow(rank, this, &CServicesManager::notificationsDumpOut) ;
   }
 
@@ -147 +141 @@
     int commRank ;
     MPI_Comm_rank(xiosComm_, &commRank) ;
-    winNotify_->lockWindowExclusive(commRank) ;
-    winNotify_->popFromLockedWindow(commRank, this, &CServicesManager::notificationsDumpIn) ;
-    winNotify_->unlockWindow(commRank) ;
+    winNotify_->popFromExclusiveWindow(commRank, this, &CServicesManager::notificationsDumpIn) ;
     if (notifyType_==NOTIFY_CREATE_SERVICE) createService() ;
     else if (notifyType_==NOTIFY_CREATE_SERVICE_ONTO) createServiceOnto() ;
@@ -253 +245 @@
     services_[std::tuple<std::string, std::string,int>(poolId,serviceId,partitionId)]=std::make_tuple(type,size,nbPartitions,leader) ;
     winServices_->updateToLockedWindow(managerGlobalLeader_, this, &CServicesManager::servicesDumpOut) ;
-    winServices_->unlockWindow(managerGlobalLeader_) ;
+    winServices_->unlockWindowExclusive(managerGlobalLeader_) ;
 
   }
@@ -260 +252 @@
                                         int& size, int& nbPartitions, int& leader, bool wait)
   {
-    winServices_->lockWindowShared(managerGlobalLeader_) ;
-    winServices_->updateFromLockedWindow(managerGlobalLeader_, this, &CServicesManager::servicesDumpIn) ;
-    winServices_->unlockWindow(managerGlobalLeader_) ;
+    winServices_->updateFromSharedWindow(managerGlobalLeader_, this, &CServicesManager::servicesDumpIn) ;
     
     if (wait) waitServiceRegistration(poolId, serviceId, partitionId) ;
@@ -303 +293 @@
   bool CServicesManager::hasService(const std::string& poolId, const std::string& serviceId, const int& partitionId)
   {
-    winServices_->lockWindowShared(managerGlobalLeader_) ;
-    winServices_->updateFromLockedWindow(managerGlobalLeader_, this, &CServicesManager::servicesDumpIn) ;
-    winServices_->unlockWindow(managerGlobalLeader_) ;
+    winServices_->updateFromSharedWindow(managerGlobalLeader_, this, &CServicesManager::servicesDumpIn) ;
     auto it=services_.find(std::tuple<std::string, std::string, int>(poolId, serviceId, partitionId)) ;
     if ( it == services_.end()) return false ;