Changeset 2258 for XIOS/dev/dev_ym/XIOS_COUPLING/src/manager

Timestamp:

11/16/21 17:37:42 (3 years ago)

Author:

ymipsl

Message:

One sided protocol improvment.
YM

Location:

XIOS/dev/dev_ym/XIOS_COUPLING/src/manager

Files:

• contexts_manager.cpp (modified) (2 diffs)
• ressources_manager.cpp (modified) (2 diffs)
• server_context.cpp (modified) (2 diffs)
• services.cpp (modified) (2 diffs)
• window_manager.hpp (modified) (2 diffs)

XIOS/dev/dev_ym/XIOS_COUPLING/src/manager/contexts_manager.cpp

@@ -109 +109 @@
   void CContextsManager::sendNotification(int rank)
   {
-    winNotify_->lockWindow(rank,0) ;
-    winNotify_->pushToWindow(rank, this, &CContextsManager::notificationsDumpOut) ;
-    winNotify_->unlockWindow(rank,0) ;
+    winNotify_->lockWindowExclusive(rank) ;
+    winNotify_->pushToLockedWindow(rank, this, &CContextsManager::notificationsDumpOut) ;
+    winNotify_->unlockWindow(rank) ;
   }
 
@@ -168 +168 @@
     int commRank ;
     MPI_Comm_rank(xiosComm_, &commRank) ;
-    winNotify_->lockWindow(commRank,0) ;
-    winNotify_->popFromWindow(commRank, this, &CContextsManager::notificationsDumpIn) ;
-    winNotify_->unlockWindow(commRank,0) ;
+    winNotify_->lockWindowExclusive(commRank) ;
+    winNotify_->popFromLockedWindow(commRank, this, &CContextsManager::notificationsDumpIn) ;
+    winNotify_->unlockWindow(commRank) ;
     if (notifyType_==NOTIFY_CREATE_CONTEXT) createServerContext() ;
     else if (notifyType_==NOTIFY_CREATE_INTERCOMM) createServerContextIntercomm() ;

XIOS/dev/dev_ym/XIOS_COUPLING/src/manager/ressources_manager.cpp

@@ -72 +72 @@
   void CRessourcesManager::sendNotification(int rank)
   {
-    winNotify_->lockWindow(rank,0) ;
-    winNotify_->pushToWindow(rank, this, &CRessourcesManager::notificationsDumpOut) ;
-    winNotify_->unlockWindow(rank,0) ;
+    winNotify_->lockWindowExclusive(rank) ;
+    winNotify_->pushToLockedWindow(rank, this, &CRessourcesManager::notificationsDumpOut) ;
+    winNotify_->unlockWindow(rank) ;
   }
 
@@ -128 +128 @@
     MPI_Comm_rank(xiosComm_, &commRank) ;
     CTimer::get("CRessourcesManager::checkNotifications lock").resume();
-    winNotify_->lockWindow(commRank,0) ;
+    winNotify_->lockWindowExclusive(commRank) ;
     CTimer::get("CRessourcesManager::checkNotifications lock").suspend();
     CTimer::get("CRessourcesManager::checkNotifications pop").resume();
-    winNotify_->popFromWindow(commRank, this, &CRessourcesManager::notificationsDumpIn) ;
+    winNotify_->popFromLockedWindow(commRank, this, &CRessourcesManager::notificationsDumpIn) ;
     CTimer::get("CRessourcesManager::checkNotifications pop").suspend();
     CTimer::get("CRessourcesManager::checkNotifications unlock").resume();
-    winNotify_->unlockWindow(commRank,0) ;
+    winNotify_->unlockWindow(commRank) ;
     CTimer::get("CRessourcesManager::checkNotifications unlock").suspend();
     if (notifyType_==NOTIFY_CREATE_POOL) createPool() ;

XIOS/dev/dev_ym/XIOS_COUPLING/src/manager/server_context.cpp

@@ -160 +160 @@
   void CServerContext::sendNotification(int rank)
   {
-    winNotify_->lockWindow(rank,0) ;
-    winNotify_->pushToWindow(rank, this, &CServerContext::notificationsDumpOut) ;
-    winNotify_->unlockWindow(rank,0) ;
+    winNotify_->lockWindowExclusive(rank) ;
+    winNotify_->pushToLockedWindow(rank, this, &CServerContext::notificationsDumpOut) ;
+    winNotify_->unlockWindow(rank) ;
   }
 
@@ -201 +201 @@
         int commRank ;
         MPI_Comm_rank(contextComm_, &commRank) ;
-        winNotify_->lockWindow(commRank,0) ;
-        winNotify_->popFromWindow(commRank, this, &CServerContext::notificationsDumpIn) ;
-        winNotify_->unlockWindow(commRank,0) ;
+        winNotify_->lockWindowExclusive(commRank) ;
+        winNotify_->popFromLockedWindow(commRank, this, &CServerContext::notificationsDumpIn) ;
+        winNotify_->unlockWindow(commRank) ;
       
         if (notifyInType_!= NOTIFY_NOTHING)

XIOS/dev/dev_ym/XIOS_COUPLING/src/manager/services.cpp

@@ -131 +131 @@
   void CService::sendNotification(int rank)
   {
-    winNotify_->lockWindow(rank,0) ;
-    winNotify_->pushToWindow(rank, this, &CService::notificationsDumpOut) ;
-    winNotify_->unlockWindow(rank,0) ;
+    winNotify_->lockWindowExclusive(rank) ;
+    winNotify_->pushToLockedWindow(rank, this, &CService::notificationsDumpOut) ;
+    winNotify_->unlockWindow(rank) ;
   }
 
@@ -175 +175 @@
         int commRank ;
         MPI_Comm_rank(serviceComm_, &commRank) ;
-        winNotify_->lockWindow(commRank,0) ;
-        winNotify_->popFromWindow(commRank, this, &CService::notificationsDumpIn) ;
-        winNotify_->unlockWindow(commRank,0) ;
+        winNotify_->lockWindowExclusive(commRank) ;
+        winNotify_->popFromLockedWindow(commRank, this, &CService::notificationsDumpIn) ;
+        winNotify_->unlockWindow(commRank) ;
       
         if (notifyInType_!= NOTIFY_NOTHING)

XIOS/dev/dev_ym/XIOS_COUPLING/src/manager/window_manager.hpp

@@ -189 +189 @@
     }
 
+    template< class T >
+    void pushToLockedWindow(int rank, T* object, void (T::*dumpOut)(CBufferOut&) )
+    {
+      size_t size ;
+      MPI_Get(&size, SIZE_BUFFER_SIZE, MPI_CHAR, rank, OFFSET_BUFFER_SIZE, SIZE_BUFFER_SIZE, MPI_CHAR, window_) ;
+      MPI_Win_flush(rank,window_) ;
+      CBufferOut buffer ;
+      (object->*dumpOut)(buffer) ;
+      size_t bufferSize=buffer.count() ;
+      size_t newSize = size + bufferSize;
+      MPI_Put(&newSize, SIZE_BUFFER_SIZE, MPI_CHAR, rank, OFFSET_BUFFER_SIZE, SIZE_BUFFER_SIZE, MPI_CHAR, window_) ;
+      MPI_Put(buffer.start(), bufferSize, MPI_CHAR, rank, OFFSET_BUFFER+size, bufferSize, MPI_CHAR, window_) ;
+    }
+
     template< typename T >
     void popFromWindow(int rank, T* object, void (T::*dumpIn)(CBufferIn&) ) 
@@ -206 +220 @@
       MPI_Win_unlock(rank, window_) ;
       
+    }
+
+    template< typename T >
+    void popFromLockedWindow(int rank, T* object, void (T::*dumpIn)(CBufferIn&) ) 
+    {
+      size_t size ;
+      MPI_Get(&size, SIZE_BUFFER_SIZE, MPI_CHAR, rank, OFFSET_BUFFER_SIZE, SIZE_BUFFER_SIZE, MPI_CHAR, window_) ;
+      MPI_Win_flush(rank,window_) ;
+      CBufferIn buffer(size) ;
+      MPI_Get(buffer.start(), size, MPI_CHAR, rank,OFFSET_BUFFER, size, MPI_CHAR, window_) ;
+      MPI_Win_flush(rank,window_) ;
+      (object->*dumpIn)(buffer) ;
+      
+      size=buffer.remain() ;
+      MPI_Put(&size, SIZE_BUFFER_SIZE, MPI_CHAR, rank, OFFSET_BUFFER_SIZE, SIZE_BUFFER_SIZE, MPI_CHAR, window_) ;
+      MPI_Put(buffer.ptr(),buffer.remain(), MPI_CHAR, rank, OFFSET_BUFFER, buffer.remain(), MPI_CHAR, window_) ;
     }