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

XIOS3/trunk/src/manager/services.cpp

@@ -27 +27 @@
     
     winNotify_ = new CWindowManager(serviceComm_, maxBufferSize_) ;
-    winNotify_->lockWindow(localRank,0) ;
-    winNotify_->updateToWindow(localRank, this, &CService::createContextDumpOut) ;
-    winNotify_->unlockWindow(localRank,0) ;
+    winNotify_->updateToExclusiveWindow(localRank, this, &CService::createContextDumpOut) ;
     MPI_Barrier(serviceComm_) ;
     if (localRank==localLeader_) 
@@ -74 +72 @@
   void CService::createContextNotify(int rank, const std::string& poolId, const std::string& serviceId, const int& partitionId, const std::string& contextId)
   {
-    winNotify_->lockWindow(rank,0) ;
-    winNotify_->updateFromWindow(rank, this, &CService::createContextDumpIn) ;
+    winNotify_->lockWindowExclusive(rank) ;
+    winNotify_->updateFromLockedWindow(rank, this, &CService::createContextDumpIn) ;
     notifications_.push_back(std::make_tuple(poolId, serviceId, partitionId, contextId)) ;
-    winNotify_->updateToWindow(rank, this, &CService::createContextDumpOut) ;  
-    winNotify_->unlockWindow(rank,0) ;   
+    winNotify_->updateToLockedWindow(rank, this, &CService::createContextDumpOut) ;  
+    winNotify_->unlockWindowExclusive(rank) ;   
   }
 
@@ -143 +141 @@
   void CService::sendNotification(int rank)
   {
-    winNotify_->lockWindowExclusive(rank) ;
-    winNotify_->pushToLockedWindow(rank, this, &CService::notificationsDumpOut) ;
-    winNotify_->unlockWindow(rank) ;
+    winNotify_->pushToExclusiveWindow(rank, this, &CService::notificationsDumpOut) ;
   }
 
@@ -187 +183 @@
         int commRank ;
         MPI_Comm_rank(serviceComm_, &commRank) ;
-        winNotify_->lockWindowExclusive(commRank) ;
-        winNotify_->popFromLockedWindow(commRank, this, &CService::notificationsDumpIn) ;
-        winNotify_->unlockWindow(commRank) ;
-      
+        winNotify_->popFromExclusiveWindow(commRank, this, &CService::notificationsDumpIn) ;
+        
         if (notifyInType_!= NOTIFY_NOTHING)
         {
@@ -227 +221 @@
     int commRank ;
     MPI_Comm_rank(serviceComm_, &commRank) ;
-    winNotify_->lockWindow(commRank,0) ;
-    winNotify_->updateFromWindow(commRank, this, &CService::createContextDumpIn) ;
+    winNotify_->lockWindowExclusive(commRank) ;
+    winNotify_->updateFromLockedWindow(commRank, this, &CService::createContextDumpIn) ;
     
     if (!notifications_.empty())
@@ -235 +229 @@
       createNewContext(get<0>(info), get<1>(info), get<2>(info), get<3>(info)) ;
       notifications_.pop_front() ;
-      winNotify_->updateToWindow(commRank, this, &CService::createContextDumpOut) ;     
-    }
-    winNotify_->unlockWindow(commRank,0) ;
+      winNotify_->updateToLockedWindow(commRank, this, &CService::createContextDumpOut) ;     
+    }
+    winNotify_->unlockWindowExclusive(commRank) ;
   }