Changeset 2517 for XIOS3/trunk/src/manager/coupler_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/coupler_manager.cpp (modified) (4 diffs)

XIOS3/trunk/src/manager/coupler_manager.cpp

@@ -23 +23 @@
     if (commRank==managerGlobalLeader_)
     {
-      winRegistredCoupling_->lockWindow(managerGlobalLeader_,0) ;
-      winRegistredCoupling_->updateToWindow(managerGlobalLeader_, this, &CCouplerManager::registredCouplingDumpOut) ;
-      winRegistredCoupling_->unlockWindow(managerGlobalLeader_,0) ;
-
-      winNextCoupling_->lockWindow(managerGlobalLeader_,0) ;
-      winNextCoupling_->updateToWindow(managerGlobalLeader_, this, &CCouplerManager::nextCouplingDumpOut) ;
-      winNextCoupling_->unlockWindow(managerGlobalLeader_,0) ;
+      winRegistredCoupling_->updateToExclusiveWindow(managerGlobalLeader_, this, &CCouplerManager::registredCouplingDumpOut) ;
+      winNextCoupling_->updateToExclusiveWindow(managerGlobalLeader_, this, &CCouplerManager::nextCouplingDumpOut) ;
     }
 
@@ -47 +42 @@
     size_t key = strHash(getStrCoupling(srcCoupling,dstCoupling)) ;
     
-    winRegistredCoupling_->lockWindow(managerGlobalLeader_,0) ;
-    winRegistredCoupling_->updateFromWindow(managerGlobalLeader_, this, &CCouplerManager::registredCouplingDumpIn) ;
+    winRegistredCoupling_->lockWindowExclusive(managerGlobalLeader_) ;
+    winRegistredCoupling_->updateFromLockedWindow(managerGlobalLeader_, this, &CCouplerManager::registredCouplingDumpIn) ;
     if (registredCoupling_.count(key)==1)
     {
       registredCoupling_.erase(key) ;
-      winRegistredCoupling_->updateToWindow(managerGlobalLeader_, this, &CCouplerManager::registredCouplingDumpOut) ;
-      winNextCoupling_->lockWindow(managerGlobalLeader_,0) ;
-      winNextCoupling_->updateFromWindow(managerGlobalLeader_, this, &CCouplerManager::nextCouplingDumpIn) ;
+      winRegistredCoupling_->updateToLockedWindow(managerGlobalLeader_, this, &CCouplerManager::registredCouplingDumpOut) ;
+      winNextCoupling_->lockWindowExclusive(managerGlobalLeader_) ;
+      winNextCoupling_->updateFromLockedWindow(managerGlobalLeader_, this, &CCouplerManager::nextCouplingDumpIn) ;
       nextCoupling_.push_back(pair<size_t,int>(key,2)) ;
-      winNextCoupling_->updateToWindow(managerGlobalLeader_, this, &CCouplerManager::nextCouplingDumpOut) ;
-      winNextCoupling_->unlockWindow(managerGlobalLeader_,0) ;
+      winNextCoupling_->updateToLockedWindow(managerGlobalLeader_, this, &CCouplerManager::nextCouplingDumpOut) ;
+      winNextCoupling_->unlockWindowExclusive(managerGlobalLeader_) ;
     }
     else 
     {
       registredCoupling_.insert(key) ;
-      winRegistredCoupling_->updateToWindow(managerGlobalLeader_, this, &CCouplerManager::registredCouplingDumpOut) ;
+      winRegistredCoupling_->updateToLockedWindow(managerGlobalLeader_, this, &CCouplerManager::registredCouplingDumpOut) ;
     }
-    winRegistredCoupling_->unlockWindow(managerGlobalLeader_,0) ;
+    winRegistredCoupling_->unlockWindowExclusive(managerGlobalLeader_) ;
   }
 
@@ -73 +68 @@
     size_t key = strHash(getStrCoupling(srcCoupling,dstCoupling)) ;
 
-    winNextCoupling_->lockWindow(managerGlobalLeader_,0) ;
-    winNextCoupling_->updateFromWindow(managerGlobalLeader_, this, &CCouplerManager::nextCouplingDumpIn) ;
+    winNextCoupling_->lockWindowExclusive(managerGlobalLeader_) ;
+    winNextCoupling_->updateFromLockedWindow(managerGlobalLeader_, this, &CCouplerManager::nextCouplingDumpIn) ;
     if (nextCoupling_.front().first==key)
     {
@@ -80 +75 @@
       if (nextCoupling_.front().second==1) nextCoupling_.pop_front() ;
       else nextCoupling_.front().second=1 ;
-      winNextCoupling_->updateToWindow(managerGlobalLeader_, this, &CCouplerManager::nextCouplingDumpOut) ;
+      winNextCoupling_->updateToLockedWindow(managerGlobalLeader_, this, &CCouplerManager::nextCouplingDumpOut) ;
     }
     else ret=false ;
-    winNextCoupling_->unlockWindow(managerGlobalLeader_,0) ;
+    winNextCoupling_->unlockWindowExclusive(managerGlobalLeader_) ;
     return ret ;
   }