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

XIOS3/trunk/src/manager/contexts_manager.cpp

@@ -27 +27 @@
     MPI_Comm_rank(xiosComm_, &commRank) ;
     winNotify_ = new CWindowManager(xiosComm_, maxBufferSize_) ;
+    winNotify_->updateToExclusiveWindow(commRank, this, &CContextsManager::notificationsDumpOut) ;
    
 
     winContexts_ = new CWindowManager(xiosComm_, maxBufferSize_) ;
-    winContexts_->lockWindow(commRank,0) ;
-    winContexts_->updateToWindow(commRank, this, &CContextsManager::contextsDumpOut) ;
-    winContexts_->unlockWindow(commRank,0) ;
-
+    winContexts_->updateToExclusiveWindow(commRank, this, &CContextsManager::contextsDumpOut) ;
+  
     MPI_Barrier(xiosComm_)  ;    
   }
@@ -111 +110 @@
     winNotify_->lockWindowExclusive(rank) ;
     winNotify_->pushToLockedWindow(rank, this, &CContextsManager::notificationsDumpOut) ;
-    winNotify_->unlockWindow(rank) ;
+    winNotify_->unlockWindowExclusive(rank) ;
   }
 
@@ -170 +169 @@
     int commRank ;
     MPI_Comm_rank(xiosComm_, &commRank) ;
-    winNotify_->lockWindowExclusive(commRank) ;
-    winNotify_->popFromLockedWindow(commRank, this, &CContextsManager::notificationsDumpIn) ;
-    winNotify_->unlockWindow(commRank) ;
+    winNotify_->popFromExclusiveWindow(commRank, this, &CContextsManager::notificationsDumpIn) ;
     if (notifyType_==NOTIFY_CREATE_CONTEXT) createServerContext() ;
     else if (notifyType_==NOTIFY_CREATE_INTERCOMM) createServerContextIntercomm() ;
@@ -215 +212 @@
     contexts_[fullContextId] = contextInfo ;
     winContexts_->updateToLockedWindow(managerGlobalLeader_, this, &CContextsManager::contextsDumpOut) ;
-    winContexts_->unlockWindow(managerGlobalLeader_) ;
+    winContexts_->unlockWindowExclusive(managerGlobalLeader_) ;
   }
 
@@ -227 +224 @@
     {
 
-      winContexts_->lockWindowShared(managerGlobalLeader_) ;
-      winContexts_->updateFromLockedWindow(managerGlobalLeader_, this, &CContextsManager::contextsDumpIn) ;
-      winContexts_->unlockWindow(managerGlobalLeader_) ;
+      winContexts_->updateFromSharedWindow(managerGlobalLeader_, this, &CContextsManager::contextsDumpIn) ;
 
       auto it=contexts_.find(fullContextId) ;