diff --git a/.github/workflows/buildTest.yml b/.github/workflows/buildTest.yml
index 9c853f4..dbb2015 100644
--- a/.github/workflows/buildTest.yml
+++ b/.github/workflows/buildTest.yml
@@ -9,7 +9,7 @@ on:
 jobs:
   build_test:
     name: build test
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     strategy:
       matrix:
         version: [XIOS/trunk@2252, XIOS2/trunk, XIOS3/trunk]
@@ -29,6 +29,8 @@ jobs:
           if [ ${{ matrix.version }} == 'XIOS3/trunk' ]; then
             sed -i 's/<variable_group id="parameters" >/<variable_group id="parameters" > <variable id="transport_protocol" type="string" >p2p<\/variable>/g' generic_testcase/iodef.xml
             cat generic_testcase/iodef.xml
+          elif [ ${{ matrix.version }} == 'XIOS/trunk@2252' ]; then
+            patch -p0 < ../patches/xios2/compilePatches.r2252.patch
           fi
           ./make_xios --job 2 --arch GCC_LINUX_APT --debug
           cd ..
diff --git a/patches/xios2/compilePatches.r2252.patch b/patches/xios2/compilePatches.r2252.patch
new file mode 100644
index 0000000..6d33959
--- /dev/null
+++ b/patches/xios2/compilePatches.r2252.patch
@@ -0,0 +1,49 @@
+Index: extern/remap/src/earcut.hpp
+===================================================================
+--- extern/remap/src/earcut.hpp	(revision 2252)
++++ extern/remap/src/earcut.hpp	(working copy)
+@@ -7,7 +7,7 @@
+ #include <vector>
+ #include <limits>
+ //#include <tuple>
+-//#include <cstdint> 
++#include <cstdint> 
+ //#include <cstddef>
+ 
+ namespace mapbox {
+Index: extern/remap/src/elt.hpp
+===================================================================
+--- extern/remap/src/elt.hpp	(revision 2252)
++++ extern/remap/src/elt.hpp	(working copy)
+@@ -2,6 +2,7 @@
+ #define __ELT_H__
+ #include <list>
+ #include "triple.hpp"
++#include <array>
+ 
+ #define NMAX 10 /**< maximum number of vertices for polygons */
+ 
+Index: src/io/nc4_data_output.cpp
+===================================================================
+--- src/io/nc4_data_output.cpp	(revision 2252)
++++ src/io/nc4_data_output.cpp	(working copy)
+@@ -11,6 +11,7 @@
+ #include "exception.hpp"
+ #include "timer.hpp"
+ #include "uuid.hpp"
++#include <cfloat>
+ namespace xios
+ {
+       /// ////////////////////// Dfinitions ////////////////////// ///
+Index: src/xios_spl.hpp
+===================================================================
+--- src/xios_spl.hpp	(revision 2252)
++++ src/xios_spl.hpp	(working copy)
+@@ -16,6 +16,7 @@
+ 
+ // Conteneurs.
+ #include <vector>
++#include <array>
+ #include <set>
+ #include <stack>
+ #include <list>
diff --git a/patches/xios3/revert_svn2517_transport.patch b/patches/xios3/revert_svn2517_transport.patch
deleted file mode 100644
index 0976052..0000000
--- a/patches/xios3/revert_svn2517_transport.patch
+++ /dev/null
@@ -1,1243 +0,0 @@
-Index: src/manager/contexts_manager.cpp
-===================================================================
---- src/manager/contexts_manager.cpp	(revision 2596)
-+++ src/manager/contexts_manager.cpp	(working copy)
-@@ -26,11 +26,12 @@
- 
-     MPI_Comm_rank(xiosComm_, &commRank) ;
-     winNotify_ = new CWindowManager(xiosComm_, maxBufferSize_,"CContextsManager::winNotify_") ;
--    winNotify_->updateToExclusiveWindow(commRank, this, &CContextsManager::notificationsDumpOut) ;
-    
- 
-     winContexts_ = new CWindowManager(xiosComm_, maxBufferSize_,"CContextsManager::winContexts_") ;
--    winContexts_->updateToExclusiveWindow(commRank, this, &CContextsManager::contextsDumpOut) ;
-+    winContexts_->lockWindow(commRank,0) ;
-+    winContexts_->updateToWindow(commRank, this, &CContextsManager::contextsDumpOut) ;
-+    winContexts_->unlockWindow(commRank,0) ;
-   
-     MPI_Barrier(xiosComm_)  ;    
-   }
-@@ -109,7 +110,7 @@
-   {
-     winNotify_->lockWindowExclusive(rank) ;
-     winNotify_->pushToLockedWindow(rank, this, &CContextsManager::notificationsDumpOut) ;
--    winNotify_->unlockWindowExclusive(rank) ;
-+    winNotify_->unlockWindow(rank) ;
-   }
- 
-   
-@@ -168,7 +169,9 @@
-   {
-     int commRank ;
-     MPI_Comm_rank(xiosComm_, &commRank) ;
--    winNotify_->popFromExclusiveWindow(commRank, this, &CContextsManager::notificationsDumpIn) ;
-+    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() ;
- 
-@@ -211,7 +214,7 @@
-     winContexts_->flushWindow(managerGlobalLeader_) ;
-     contexts_[fullContextId] = contextInfo ;
-     winContexts_->updateToLockedWindow(managerGlobalLeader_, this, &CContextsManager::contextsDumpOut) ;
--    winContexts_->unlockWindowExclusive(managerGlobalLeader_) ;
-+    winContexts_->unlockWindow(managerGlobalLeader_) ;
-   }
- 
-   bool CContextsManager::getContextInfo(const string& fullContextId, SRegisterContextInfo& contextInfo, MPI_Comm comm)
-@@ -223,7 +226,9 @@
-     if (commRank==0)
-     {
- 
--      winContexts_->updateFromSharedWindow(managerGlobalLeader_, this, &CContextsManager::contextsDumpIn) ;
-+      winContexts_->lockWindowShared(managerGlobalLeader_) ;
-+      winContexts_->updateFromLockedWindow(managerGlobalLeader_, this, &CContextsManager::contextsDumpIn) ;
-+      winContexts_->unlockWindow(managerGlobalLeader_) ;
- 
-       auto it=contexts_.find(fullContextId) ;
-       if ( it == contexts_.end()) ret=false ;
-Index: src/manager/coupler_manager.cpp
-===================================================================
---- src/manager/coupler_manager.cpp	(revision 2596)
-+++ src/manager/coupler_manager.cpp	(working copy)
-@@ -22,8 +22,13 @@
-     winNextCoupling_ = new CWindowManager(xiosComm_, maxBufferSize_,"CCouplerManager::winNextCoupling_") ;
-     if (commRank==managerGlobalLeader_)
-     {
--      winRegistredCoupling_->updateToExclusiveWindow(managerGlobalLeader_, this, &CCouplerManager::registredCouplingDumpOut) ;
--      winNextCoupling_->updateToExclusiveWindow(managerGlobalLeader_, this, &CCouplerManager::nextCouplingDumpOut) ;
-+      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) ; 
-     }
- 
-     MPI_Barrier(xiosComm_)  ;    
-@@ -41,24 +46,24 @@
-     hash<string> strHash ;
-     size_t key = strHash(getStrCoupling(srcCoupling,dstCoupling)) ;
-     
--    winRegistredCoupling_->lockWindowExclusive(managerGlobalLeader_) ;
--    winRegistredCoupling_->updateFromLockedWindow(managerGlobalLeader_, this, &CCouplerManager::registredCouplingDumpIn) ;
-+    winRegistredCoupling_->lockWindow(managerGlobalLeader_,0) ; 
-+    winRegistredCoupling_->updateFromWindow(managerGlobalLeader_, this, &CCouplerManager::registredCouplingDumpIn) ;
-     if (registredCoupling_.count(key)==1)
-     {
-       registredCoupling_.erase(key) ;
--      winRegistredCoupling_->updateToLockedWindow(managerGlobalLeader_, this, &CCouplerManager::registredCouplingDumpOut) ;
--      winNextCoupling_->lockWindowExclusive(managerGlobalLeader_) ;
--      winNextCoupling_->updateFromLockedWindow(managerGlobalLeader_, this, &CCouplerManager::nextCouplingDumpIn) ;
-+      winRegistredCoupling_->updateToWindow(managerGlobalLeader_, this, &CCouplerManager::registredCouplingDumpOut) ;
-+      winNextCoupling_->lockWindow(managerGlobalLeader_,0) ;
-+      winNextCoupling_->updateFromWindow(managerGlobalLeader_, this, &CCouplerManager::nextCouplingDumpIn) ;
-       nextCoupling_.push_back(pair<size_t,int>(key,2)) ;
--      winNextCoupling_->updateToLockedWindow(managerGlobalLeader_, this, &CCouplerManager::nextCouplingDumpOut) ;
--      winNextCoupling_->unlockWindowExclusive(managerGlobalLeader_) ;
-+      winNextCoupling_->updateToWindow(managerGlobalLeader_, this, &CCouplerManager::nextCouplingDumpOut) ;
-+      winNextCoupling_->unlockWindow(managerGlobalLeader_,0) ;
-     }
-     else 
-     {
-       registredCoupling_.insert(key) ;
--      winRegistredCoupling_->updateToLockedWindow(managerGlobalLeader_, this, &CCouplerManager::registredCouplingDumpOut) ;
-+      winRegistredCoupling_->updateToWindow(managerGlobalLeader_, this, &CCouplerManager::registredCouplingDumpOut) ;
-     }
--    winRegistredCoupling_->unlockWindowExclusive(managerGlobalLeader_) ;
-+    winRegistredCoupling_->unlockWindow(managerGlobalLeader_,0) ;
-   }
- 
-   bool CCouplerManager::isNextCoupling(string srcCoupling, string dstCoupling)
-@@ -67,17 +72,17 @@
-     hash<string> strHash ;
-     size_t key = strHash(getStrCoupling(srcCoupling,dstCoupling)) ;
- 
--    winNextCoupling_->lockWindowExclusive(managerGlobalLeader_) ;
--    winNextCoupling_->updateFromLockedWindow(managerGlobalLeader_, this, &CCouplerManager::nextCouplingDumpIn) ;
-+    winNextCoupling_->lockWindow(managerGlobalLeader_,0) ;
-+    winNextCoupling_->updateFromWindow(managerGlobalLeader_, this, &CCouplerManager::nextCouplingDumpIn) ; 
-     if (nextCoupling_.front().first==key)
-     {
-       ret=true ;
-       if (nextCoupling_.front().second==1) nextCoupling_.pop_front() ;
-       else nextCoupling_.front().second=1 ;
--      winNextCoupling_->updateToLockedWindow(managerGlobalLeader_, this, &CCouplerManager::nextCouplingDumpOut) ;
-+      winNextCoupling_->updateToWindow(managerGlobalLeader_, this, &CCouplerManager::nextCouplingDumpOut) ;
-     }
-     else ret=false ;
--    winNextCoupling_->unlockWindowExclusive(managerGlobalLeader_) ;
-+    winNextCoupling_->unlockWindow(managerGlobalLeader_,0) ;
-     return ret ;
-   }
-   void CCouplerManager::registredCouplingDumpOut(CBufferOut& buffer)
-@@ -123,4 +128,4 @@
-     }
-   }
- 
--}
-\ No newline at end of file
-+}
-Index: src/manager/pool_ressource.cpp
-===================================================================
---- src/manager/pool_ressource.cpp	(revision 2596)
-+++ src/manager/pool_ressource.cpp	(working copy)
-@@ -29,7 +29,9 @@
-     }
-     
-     notifyType_=NOTIFY_NOTHING;
--    winNotify_->updateToExclusiveWindow(commRank, this, &CPoolRessource::notificationsDumpOut) ;
-+    winNotify_->lockWindow(commRank,0) ;
-+    winNotify_->updateToWindow(commRank, this, &CPoolRessource::notificationsDumpOut) ;
-+    winNotify_->unlockWindow(commRank,0) ;
-     MPI_Barrier(poolComm_) ;
-     if (eventScheduler) eventScheduler_=eventScheduler ;
-     else eventScheduler_= make_shared<CEventScheduler>(poolComm) ;
-@@ -132,14 +134,18 @@
- 
-   void CPoolRessource::sendNotification(int rank)
-   {
--    winNotify_->pushToExclusiveWindow(rank, this, &CPoolRessource::notificationsDumpOut) ;
-+    winNotify_->lockWindowExclusive(rank) ; 
-+    winNotify_->pushToLockedWindow(rank, this, &CPoolRessource::notificationsDumpOut) ; 
-+    winNotify_->unlockWindow(rank) ; 
-   }
- 
-   void CPoolRessource::checkNotifications(void)
-   {
-     int commRank ;
-     MPI_Comm_rank(poolComm_, &commRank) ;
--    winNotify_->popFromExclusiveWindow(commRank, this, &CPoolRessource::notificationsDumpIn) ;
-+    winNotify_->lockWindowExclusive(commRank) ;
-+    winNotify_->popFromLockedWindow(commRank, this, &CPoolRessource::notificationsDumpIn) ;
-+    winNotify_->unlockWindow(commRank) ; 
-     if (notifyType_==NOTIFY_CREATE_SERVICE) 
-     {
-       if (CThreadManager::isUsingThreads()) synchronize() ;
-Index: src/manager/ressources_manager.cpp
-===================================================================
---- src/manager/ressources_manager.cpp	(revision 2596)
-+++ src/manager/ressources_manager.cpp	(working copy)
-@@ -49,7 +49,9 @@
-   {
-     info(40)<<"CRessourcesManager::createPool : calling createPool : "<<poolId<<"  of size"<<size<<endl ;
-     info(40)<<"send notification to leader : "<<serverLeader_<<endl ;
--    winRessources_->updateFromExclusiveWindow(managerGlobalLeader_, this, &CRessourcesManager::ressourcesDumpIn) ;
-+    winRessources_->lockWindow(managerGlobalLeader_,0) ;
-+    winRessources_->updateFromWindow(managerGlobalLeader_, this, &CRessourcesManager::ressourcesDumpIn) ;
-+    winRessources_->unlockWindow(managerGlobalLeader_,0) ;
-     
-     notifyType_=NOTIFY_CREATE_POOL ;
-     notifyCreatePool_=make_tuple(poolId, size) ;
-@@ -59,7 +61,9 @@
-   
-   void CRessourcesManager::finalize(void)
-   {
--    winRessources_->updateFromExclusiveWindow(managerGlobalLeader_, this, &CRessourcesManager::ressourcesDumpIn) ;
-+    winRessources_->lockWindow(managerGlobalLeader_,0) ;
-+    winRessources_->updateFromWindow(managerGlobalLeader_, this, &CRessourcesManager::ressourcesDumpIn) ;
-+    winRessources_->unlockWindow(managerGlobalLeader_,0) ;
-    
-     if (serverLeader_!=-1)
-     {
-@@ -73,7 +77,7 @@
-   {
-     winNotify_->lockWindowExclusive(rank) ;
-     winNotify_->pushToLockedWindow(rank, this, &CRessourcesManager::notificationsDumpOut) ;
--    winNotify_->unlockWindowExclusive(rank) ;
-+    winNotify_->unlockWindow(rank) ; 
-   }
- 
-   
-@@ -135,7 +139,7 @@
-     winNotify_->popFromLockedWindow(commRank, this, &CRessourcesManager::notificationsDumpIn) ;
-     if (info.isActive(logTimers)) CTimer::get("CRessourcesManager::checkNotifications pop").suspend();
-     if (info.isActive(logTimers)) CTimer::get("CRessourcesManager::checkNotifications unlock").resume();
--    winNotify_->unlockWindowExclusive(commRank) ;
-+    winNotify_->unlockWindow(commRank) ;
-     if (info.isActive(logTimers)) CTimer::get("CRessourcesManager::checkNotifications unlock").suspend();
-     if (notifyType_==NOTIFY_CREATE_POOL) createPool() ;
-     else if (notifyType_==NOTIFY_FINALIZE) finalizeSignal() ;
-@@ -192,46 +196,48 @@
-   
-   void CRessourcesManager::registerServerLeader(int serverLeaderRank)
-   {
--    winRessources_->lockWindowExclusive(managerGlobalLeader_) ;
--    winRessources_->updateFromLockedWindow(managerGlobalLeader_, this, &CRessourcesManager::ressourcesDumpIn) ;
-+    winRessources_->lockWindow(managerGlobalLeader_,0) ;
-+    winRessources_->updateFromWindow(managerGlobalLeader_, this, &CRessourcesManager::ressourcesDumpIn) ;
-     serverLeader_ = serverLeaderRank ;
--    winRessources_->updateToLockedWindow(managerGlobalLeader_, this, &CRessourcesManager::ressourcesDumpOut) ;
--    winRessources_->unlockWindowExclusive(managerGlobalLeader_) ;    
-+    winRessources_->updateToWindow(managerGlobalLeader_, this, &CRessourcesManager::ressourcesDumpOut) ;
-+    winRessources_->unlockWindow(managerGlobalLeader_,0) ;
-   }
-   
-   void CRessourcesManager::registerRessourcesSize(int size)
-   {
--    winRessources_->lockWindowExclusive(managerGlobalLeader_) ;
--    winRessources_->updateFromLockedWindow(managerGlobalLeader_, this, &CRessourcesManager::ressourcesDumpIn) ;
-+    winRessources_->lockWindow(managerGlobalLeader_,0) ;
-+    winRessources_->updateFromWindow(managerGlobalLeader_, this, &CRessourcesManager::ressourcesDumpIn) ; 
-     ressourcesSize_ = size ;
-     freeRessourcesSize_ = size ;
--    winRessources_->updateToLockedWindow(managerGlobalLeader_, this, &CRessourcesManager::ressourcesDumpOut) ;
--    winRessources_->unlockWindowExclusive(managerGlobalLeader_) ;    
-+    winRessources_->updateToWindow(managerGlobalLeader_, this, &CRessourcesManager::ressourcesDumpOut) ;
-+    winRessources_->unlockWindow(managerGlobalLeader_,0) ;     
-   }
- 
-  
-   void CRessourcesManager::registerPoolClient(const string& poolId, int size, int leader)
-   {
--    winRessources_->lockWindowExclusive(managerGlobalLeader_) ;
--    winRessources_->updateFromLockedWindow(managerGlobalLeader_, this, &CRessourcesManager::ressourcesDumpIn) ;
-+    winRessources_->lockWindow(managerGlobalLeader_,0) ;
-+    winRessources_->updateFromWindow(managerGlobalLeader_, this, &CRessourcesManager::ressourcesDumpIn) ; 
-     pools_[poolId] = make_tuple(size, size, leader) ;
--    winRessources_->updateToLockedWindow(managerGlobalLeader_, this, &CRessourcesManager::ressourcesDumpOut) ;
--    winRessources_->unlockWindowExclusive(managerGlobalLeader_) ;    
-+    winRessources_->updateToWindow(managerGlobalLeader_, this, &CRessourcesManager::ressourcesDumpOut) ;
-+    winRessources_->unlockWindow(managerGlobalLeader_,0) ;     
-   }
- 
-   void CRessourcesManager::registerPoolServer(const string& poolId, int size, int leader)
-   {
--    winRessources_->lockWindowExclusive(managerGlobalLeader_) ;
--    winRessources_->updateFromLockedWindow(managerGlobalLeader_, this, &CRessourcesManager::ressourcesDumpIn) ;
-+    winRessources_->lockWindow(managerGlobalLeader_,0) ;
-+    winRessources_->updateFromWindow(managerGlobalLeader_, this, &CRessourcesManager::ressourcesDumpIn) ; 
-     pools_[poolId] = make_tuple(size, size, leader) ;
-     freeRessourcesSize_-=size ;
--    winRessources_->updateToLockedWindow(managerGlobalLeader_, this, &CRessourcesManager::ressourcesDumpOut) ;
--    winRessources_->unlockWindowExclusive(managerGlobalLeader_) ;    
-+    winRessources_->updateToWindow(managerGlobalLeader_, this, &CRessourcesManager::ressourcesDumpOut) ;
-+    winRessources_->unlockWindow(managerGlobalLeader_,0) ;     
-   }
- 
-   bool CRessourcesManager::getPoolInfo(const string& poolId, int& size, int& freeSize, int& leader)
-   {
--    winRessources_->updateFromSharedWindow(managerGlobalLeader_, this, &CRessourcesManager::ressourcesDumpIn) ;
-+    winRessources_->lockWindow(managerGlobalLeader_,0) ; 
-+    winRessources_->updateFromWindow(managerGlobalLeader_, this, &CRessourcesManager::ressourcesDumpIn) ; 
-+    winRessources_->unlockWindow(managerGlobalLeader_,0) ; 
- 
-     auto it=pools_.find(poolId) ;
-     if ( it == pools_.end()) return false ;
-@@ -248,8 +254,8 @@
-   {
-     bool ret ;
- 
--    winRessources_->lockWindowExclusive(managerGlobalLeader_) ;
--    winRessources_->updateFromLockedWindow(managerGlobalLeader_, this, &CRessourcesManager::ressourcesDumpIn) ;
-+    winRessources_->lockWindow(managerGlobalLeader_,0) ;
-+    winRessources_->updateFromWindow(managerGlobalLeader_, this, &CRessourcesManager::ressourcesDumpIn) ; 
-    
- 
-     auto it=pools_.find(poolId) ;
-@@ -260,22 +266,26 @@
-       get<1>(it->second)-=size ;
-       ret=true ;
-     }
--    winRessources_->updateToLockedWindow(managerGlobalLeader_, this, &CRessourcesManager::ressourcesDumpOut) ;
--    winRessources_->unlockWindowExclusive(managerGlobalLeader_) ; 
-+    winRessources_->updateToWindow(managerGlobalLeader_, this, &CRessourcesManager::ressourcesDumpOut) ;
-+    winRessources_->unlockWindow(managerGlobalLeader_,0) ;
- 
-     return ret ;   
-   }
- 
-   int CRessourcesManager::getRessourcesSize(void)
-   {
--    winRessources_->updateFromSharedWindow(managerGlobalLeader_, this, &CRessourcesManager::ressourcesDumpIn) ;
-+    winRessources_->lockWindow(managerGlobalLeader_,0) ;
-+    winRessources_->updateFromWindow(managerGlobalLeader_, this, &CRessourcesManager::ressourcesDumpIn) ;
-+    winRessources_->unlockWindow(managerGlobalLeader_,0) ; 
-     
-     return ressourcesSize_ ;
-   }
- 
-   int CRessourcesManager::getFreeRessourcesSize(void)
-   {
--    winRessources_->updateFromSharedWindow(managerGlobalLeader_, this, &CRessourcesManager::ressourcesDumpIn) ;
-+    winRessources_->lockWindow(managerGlobalLeader_,0) ;
-+    winRessources_->updateFromWindow(managerGlobalLeader_, this, &CRessourcesManager::ressourcesDumpIn) ;
-+    winRessources_->unlockWindow(managerGlobalLeader_,0) ;
- 
-     return freeRessourcesSize_ ;
-   } 
-Index: src/manager/server_context.cpp
-===================================================================
---- src/manager/server_context.cpp	(revision 2596)
-+++ src/manager/server_context.cpp	(working copy)
-@@ -161,7 +161,9 @@
-   
-   void CServerContext::sendNotification(int rank)
-   {
--    winNotify_->pushToExclusiveWindow(rank, this, &CServerContext::notificationsDumpOut) ;
-+    winNotify_->lockWindowExclusive(rank) ;
-+    winNotify_->pushToLockedWindow(rank, this, &CServerContext::notificationsDumpOut) ; 
-+    winNotify_->unlockWindow(rank) ; 
-   }
- 
-   
-@@ -200,7 +202,9 @@
-       {
-         int commRank ;
-         MPI_Comm_rank(contextComm_, &commRank) ;
--        winNotify_->popFromExclusiveWindow(commRank, this, &CServerContext::notificationsDumpIn) ;
-+        winNotify_->lockWindowExclusive(commRank) ;
-+        winNotify_->popFromLockedWindow(commRank, this, &CServerContext::notificationsDumpIn) ;
-+        winNotify_->unlockWindow(commRank) ;
-        
-         if (notifyInType_!= NOTIFY_NOTHING)
-         {
-Index: src/manager/servers_ressource.cpp
-===================================================================
---- src/manager/servers_ressource.cpp	(revision 2596)
-+++ src/manager/servers_ressource.cpp	(working copy)
-@@ -87,7 +87,9 @@
- 
-   void CServersRessource::sendNotification(int rank)
-   {
--    winNotify_->pushToExclusiveWindow(rank, this, &CServersRessource::notificationsDumpOut) ;
-+    winNotify_->lockWindow(rank,0) ;
-+    winNotify_->pushToWindow(rank, this, &CServersRessource::notificationsDumpOut) ;
-+    winNotify_->unlockWindow(rank,0) ;
-   }
- 
- 
-@@ -189,7 +191,9 @@
-   {
-     int commRank ;
-     MPI_Comm_rank(serverComm_, &commRank) ;
--    winNotify_->popFromExclusiveWindow(commRank, this, &CServersRessource::notificationsDumpIn) ;
-+    winNotify_->lockWindow(commRank,0) ;
-+    winNotify_->popFromWindow(commRank, this, &CServersRessource::notificationsDumpIn) ;
-+    winNotify_->unlockWindow(commRank,0) ;
-     if (notifyInType_==NOTIFY_CREATE_POOL) 
-     {
-       if (CThreadManager::isUsingThreads()) synchronize() ;
-Index: src/manager/services.cpp
-===================================================================
---- src/manager/services.cpp	(revision 2596)
-+++ src/manager/services.cpp	(working copy)
-@@ -28,7 +28,9 @@
-     MPI_Comm_rank(serviceComm_,&localRank) ;
-     
-     winNotify_ = new CWindowManager(serviceComm_, maxBufferSize_,"CService::winNotify_") ;
--    winNotify_->updateToExclusiveWindow(localRank, this, &CService::createContextDumpOut) ;
-+    winNotify_->lockWindow(localRank,0) ;
-+    winNotify_->updateToWindow(localRank, this, &CService::createContextDumpOut) ;
-+    winNotify_->unlockWindow(localRank,0) ; 
-     MPI_Barrier(serviceComm_) ;
-     if (localRank==localLeader_) 
-     {
-@@ -48,7 +50,7 @@
- 
-   CService::~CService()
-   {
--    delete winNotify_ ;
-+    //delete winNotify_ ;
-     for(auto& it : contexts_) delete it.second ;
-   }
- 
-@@ -75,11 +77,11 @@
- */
-   void CService::createContextNotify(int rank, const std::string& poolId, const std::string& serviceId, const int& partitionId, const std::string& contextId)
-   {
--    winNotify_->lockWindowExclusive(rank) ;
--    winNotify_->updateFromLockedWindow(rank, this, &CService::createContextDumpIn) ;
-+    winNotify_->lockWindow(rank,0) ;
-+    winNotify_->updateFromWindow(rank, this, &CService::createContextDumpIn) ; 
-     notifications_.push_back(std::make_tuple(poolId, serviceId, partitionId, contextId)) ;
--    winNotify_->updateToLockedWindow(rank, this, &CService::createContextDumpOut) ;  
--    winNotify_->unlockWindowExclusive(rank) ;   
-+    winNotify_->updateToWindow(rank, this, &CService::createContextDumpOut) ;
-+    winNotify_->unlockWindow(rank,0) ;   
-   }
- 
- 
-@@ -188,7 +190,9 @@
- 
-   void CService::sendNotification(int rank)
-   {
--    winNotify_->pushToExclusiveWindow(rank, this, &CService::notificationsDumpOut) ;
-+    winNotify_->lockWindowExclusive(rank) ;
-+    winNotify_->pushToLockedWindow(rank, this, &CService::notificationsDumpOut) ;
-+    winNotify_->unlockWindow(rank) ; 
-   }
- 
-   
-@@ -230,7 +234,9 @@
-       {
-         int commRank ;
-         MPI_Comm_rank(serviceComm_, &commRank) ;
--        winNotify_->popFromExclusiveWindow(commRank, this, &CService::notificationsDumpIn) ;
-+        winNotify_->lockWindowExclusive(commRank) ;
-+        winNotify_->popFromLockedWindow(commRank, this, &CService::notificationsDumpIn) ;
-+        winNotify_->unlockWindow(commRank) ; 
-         
-         if (notifyInType_!= NOTIFY_NOTHING)
-         {
-@@ -268,17 +274,17 @@
-   {
-     int commRank ;
-     MPI_Comm_rank(serviceComm_, &commRank) ;
--    winNotify_->lockWindowExclusive(commRank) ;
--    winNotify_->updateFromLockedWindow(commRank, this, &CService::createContextDumpIn) ;
-+    winNotify_->lockWindow(commRank,0) ;
-+    winNotify_->updateFromWindow(commRank, this, &CService::createContextDumpIn) ; 
-     
-     if (!notifications_.empty())
-     {
-       auto info = notifications_.front() ;
-       createNewContext(get<0>(info), get<1>(info), get<2>(info), get<3>(info)) ;
-       notifications_.pop_front() ;
--      winNotify_->updateToLockedWindow(commRank, this, &CService::createContextDumpOut) ;     
-+      winNotify_->updateToWindow(commRank, this, &CService::createContextDumpOut) ;
-     }
--    winNotify_->unlockWindowExclusive(commRank) ;
-+    winNotify_->unlockWindow(commRank,0) ;
-   }
- 
-   void CService::createContext(void)
-Index: src/manager/services_manager.cpp
-===================================================================
---- src/manager/services_manager.cpp	(revision 2596)
-+++ src/manager/services_manager.cpp	(working copy)
-@@ -30,10 +30,14 @@
- 
-     MPI_Comm_rank(xiosComm_, &commRank) ;
-     winNotify_ = new CWindowManager(xiosComm_, maxBufferSize_,"CServicesManager::winNotify_") ;
--    winNotify_->updateToExclusiveWindow(commRank, this, &CServicesManager::notificationsDumpOut) ;
-+    winNotify_->lockWindow(commRank,0) ;
-+    winNotify_->updateToWindow(commRank, this, &CServicesManager::notificationsDumpOut) ;
-+    winNotify_->unlockWindow(commRank,0) ;
- 
-     winServices_ = new CWindowManager(xiosComm_, maxBufferSize_,"CServicesManager::winServices_") ;
--    winServices_->updateToExclusiveWindow(commRank, this, &CServicesManager::servicesDumpOut) ;
-+    winServices_->lockWindow(commRank,0) ;
-+    winServices_->updateToWindow(commRank, this, &CServicesManager::servicesDumpOut) ;
-+    winServices_->unlockWindow(commRank,0) ; 
-    
-     MPI_Barrier(xiosComm_)  ;    
-   }
-@@ -116,7 +120,9 @@
- 
-   void CServicesManager::sendNotification(int rank)
-   {
--    winNotify_->pushToExclusiveWindow(rank, this, &CServicesManager::notificationsDumpOut) ;
-+    winNotify_->lockWindowExclusive(rank) ;
-+    winNotify_->pushToLockedWindow(rank, this, &CServicesManager::notificationsDumpOut) ;
-+    winNotify_->unlockWindow(rank) ; 
-   }
- 
-   
-@@ -140,7 +146,9 @@
-   {
-     int commRank ;
-     MPI_Comm_rank(xiosComm_, &commRank) ;
--    winNotify_->popFromExclusiveWindow(commRank, this, &CServicesManager::notificationsDumpIn) ;
-+    winNotify_->lockWindowExclusive(commRank) ;
-+    winNotify_->popFromLockedWindow(commRank, this, &CServicesManager::notificationsDumpIn) ;
-+    winNotify_->unlockWindow(commRank) ; 
-     if (notifyType_==NOTIFY_CREATE_SERVICE) createService() ;
-     else if (notifyType_==NOTIFY_CREATE_SERVICE_ONTO) createServiceOnto() ;
-   }
-@@ -244,14 +252,16 @@
-     winServices_->flushWindow(managerGlobalLeader_) ;
-     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_->unlockWindowExclusive(managerGlobalLeader_) ;
-+    winServices_->unlockWindow(managerGlobalLeader_) ;
- 
-   }
- 
-   bool CServicesManager::getServiceInfo(const std::string& poolId, const std::string& serviceId, const int& partitionId, int& type, 
-                                         int& size, int& nbPartitions, int& leader, bool wait)
-   {
--    winServices_->updateFromSharedWindow(managerGlobalLeader_, this, &CServicesManager::servicesDumpIn) ;
-+    winServices_->lockWindowShared(managerGlobalLeader_) ;
-+    winServices_->updateFromLockedWindow(managerGlobalLeader_, this, &CServicesManager::servicesDumpIn) ;
-+    winServices_->unlockWindow(managerGlobalLeader_) ;
-     
-     if (wait) waitServiceRegistration(poolId, serviceId, partitionId) ;
-     auto it=services_.find(std::tuple<std::string,std::string,int>(poolId,serviceId,partitionId)) ;
-@@ -292,7 +302,9 @@
- 
-   bool CServicesManager::hasService(const std::string& poolId, const std::string& serviceId, const int& partitionId)
-   {
--    winServices_->updateFromSharedWindow(managerGlobalLeader_, this, &CServicesManager::servicesDumpIn) ;
-+    winServices_->lockWindowShared(managerGlobalLeader_) ;
-+    winServices_->updateFromLockedWindow(managerGlobalLeader_, this, &CServicesManager::servicesDumpIn) ;
-+    winServices_->unlockWindow(managerGlobalLeader_) ;
-     auto it=services_.find(std::tuple<std::string, std::string, int>(poolId, serviceId, partitionId)) ;
-     if ( it == services_.end()) return false ;
-     else return true ;
-Index: src/manager/window_manager.cpp
-===================================================================
---- src/manager/window_manager.cpp	(revision 2596)
-+++ src/manager/window_manager.cpp	(working copy)
-@@ -6,11 +6,11 @@
- namespace xios
- {
-   
--    const MPI_Aint CWindowManager::OFFSET_LOCK ;
--    const int CWindowManager::SIZE_LOCK ;
--    const MPI_Aint CWindowManager::OFFSET_BUFFER_SIZE ;
--    const int CWindowManager::SIZE_BUFFER_SIZE ;
--    const MPI_Aint CWindowManager::OFFSET_BUFFER;
--    const int CWindowManager::WINDOWS_LOCKED ;
-+//    const MPI_Aint CWindowManager::OFFSET_LOCK ;
-+//    const int CWindowManager::SIZE_LOCK ;
-+//    const MPI_Aint CWindowManager::OFFSET_BUFFER_SIZE ;
-+//    const int CWindowManager::SIZE_BUFFER_SIZE ;
-+//    const MPI_Aint CWindowManager::OFFSET_BUFFER;
-+//    const int CWindowManager::WINDOWS_LOCKED ;
- }
- 
-Index: src/manager/window_manager.hpp
-===================================================================
---- src/manager/window_manager.hpp	(revision 2596)
-+++ src/manager/window_manager.hpp	(working copy)
-@@ -1,300 +1,376 @@
--#ifndef __WINDOW_MANAGER_HPP__
--#define __WINDOW_MANAGER_HPP__
--
--#include <map>
--#include "mpi.hpp"
--#include "buffer_in.hpp"
--#include "buffer_out.hpp"
--#include "message.hpp"
--#include "window_base.hpp"
--
--namespace xios
--{
--
--
--  class CWindowManager : public CWindowBase 
--  {
--
--    private :
--    static const MPI_Aint OFFSET_LOCK=0 ;
--    static const int SIZE_LOCK=sizeof(int) ;
--    static const MPI_Aint OFFSET_BUFFER_SIZE=OFFSET_LOCK+SIZE_LOCK ;
--    static const int SIZE_BUFFER_SIZE=sizeof(size_t) ;
--    static const MPI_Aint OFFSET_BUFFER=OFFSET_BUFFER_SIZE+SIZE_BUFFER_SIZE ;
--    static const int WINDOWS_LOCKED=-1 ;
--
--    MPI_Win window_ ;
--    void * winBuffer_ ;
--    map<int,double> lastTimeLock_ ;
--    const double latency_=0e-2 ; 
--
--    public :
--
--    CWindowManager(MPI_Comm winComm, size_t bufferSize, const string name) : CWindowBase(winComm, bufferSize + OFFSET_BUFFER_SIZE, name)
--    {
--      int lock=0 ;
--      size_t size=0 ;
--      int commRank ;
--      MPI_Comm_rank(winComm, &commRank) ;
--      lockExclusive(commRank) ;
--      put(&lock, SIZE_LOCK, MPI_CHAR, commRank, OFFSET_LOCK, SIZE_LOCK, MPI_CHAR) ;
--      put(&size, SIZE_BUFFER_SIZE, MPI_CHAR, commRank, OFFSET_BUFFER_SIZE, SIZE_BUFFER_SIZE, MPI_CHAR) ;
--      unlockExclusive(commRank) ;
--      MPI_Barrier(winComm) ;
--    }
--    
--    void lockWindow(int rank, int state )
--    {
--      int lock=state ;
--      double time ;
--      auto it=lastTimeLock_.find(rank) ;
--      if (it == lastTimeLock_.end()) 
--      { 
--        lastTimeLock_[rank] = 0. ; 
--        it=lastTimeLock_.find(rank) ;
--      }
--      double& lastTime = it->second ;
--
--      do 
--      {
--        time=MPI_Wtime() ;
--        while(time-lastTime < latency_) time=MPI_Wtime() ;
--        int flag ;
--        MPI_Iprobe(MPI_ANY_SOURCE, MPI_ANY_TAG, MPI_COMM_WORLD, &flag, MPI_STATUS_IGNORE);
--        compareAndSwap(&WINDOWS_LOCKED, &state, &lock, MPI_INT, rank, OFFSET_LOCK) ;
--        flush(rank) ;
--        lastTime=MPI_Wtime() ;
--      } while (lock!=state) ;
--      
--      
--    }
--
--    void lockWindowExclusive(int rank, int state )
--    {
--      int lock=state ;
--      double time ;
--      auto it=lastTimeLock_.find(rank) ;
--      if (it == lastTimeLock_.end()) 
--      { 
--        lastTimeLock_[rank] = 0. ; 
--        it=lastTimeLock_.find(rank) ;
--      }
--      double& lastTime = it->second ;
--
--      do 
--      {
--        time=MPI_Wtime() ;
--        while(time-lastTime < latency_) time=MPI_Wtime() ;
--        int flag ;
--        MPI_Iprobe(MPI_ANY_SOURCE, MPI_ANY_TAG, MPI_COMM_WORLD, &flag, MPI_STATUS_IGNORE);
--        lockExclusive(rank) ;
--        compareAndSwap(&WINDOWS_LOCKED, &state, &lock, MPI_INT, rank, OFFSET_LOCK) ;
--        unlockExclusive(rank) ;
--        lastTime=MPI_Wtime() ;
--      } while (lock!=state) ;
--    }
--
--    void lockWindowExclusive(int rank)
--    {
--      lockExclusive(rank) ;
--    }
--
--    void lockWindowShared(int rank)
--    {
--      lockShared(rank) ;
--    }
--
--    void unlockWindowExclusive(int rank)
--    {
--      unlockExclusive(rank) ;
--    }
--
--    void unlockWindowShared(int rank)
--    {
--      unlockShared(rank) ;
--    }
--
--    void lockWindow(int rank)
--    {
--      lockWindowExclusive(rank) ;
--    }
--    
--    void unlockWindow(int rank)
--    {
--      unlockWindowExclusive(rank) ;
--    }
--
--    void flushWindow(int rank)
--    {
--      flush(rank) ;
--    }
--
--    void unlockWindow(int rank, int state )
--    {
--      int lock ;
--      compareAndSwap(&state, &WINDOWS_LOCKED, &lock, MPI_INT, rank, OFFSET_LOCK) ;
--      flush(rank) ;
--    }
--    
--    template< class T >
--    void updateToWindow(int rank, T* object, void (T::*dumpOut)(CBufferOut&) )
--    {
--      updateToExclusiveWindow(rank, object, dumpOut) ;
--    }
--
--    template< class T >
--    void updateToExclusiveWindow(int rank, T* object, void (T::*dumpOut)(CBufferOut&) )
--    {
--      lockExclusive(rank) ;
--      updateToLockedWindow(rank, object, dumpOut) ;
--      unlockExclusive(rank) ;
--     }
--
--    template< class T >
--    void updateTosharedWindow(int rank, T* object, void (T::*dumpOut)(CBufferOut&) )
--    {
--      lockShared(rank) ;
--      updateToLockedWindow(rank, object, dumpOut) ;
--      unlockShared(rank) ;
--    }
--
--    template< class T >
--    void updateToLockedWindow(int rank, T* object, void (T::*dumpOut)(CBufferOut&) )
--    {
--      CBufferOut buffer ;
--      (object->*dumpOut)(buffer) ;
--      size_t size=buffer.count() ;
--
--      put(&size, SIZE_BUFFER_SIZE, MPI_CHAR, rank, OFFSET_BUFFER_SIZE, SIZE_BUFFER_SIZE, MPI_CHAR) ;
--      put(buffer.start(), size, MPI_CHAR, rank,OFFSET_BUFFER, size, MPI_CHAR) ;
--      flush(rank) ;
--    }
--
--    template< typename T >
--    void updateFromWindow(int rank, T* object, void (T::*dumpIn)(CBufferIn&) ) 
--    {
--      updateFromExclusiveWindow(rank,object, dumpIn) ;
--    }
--
--    template< typename T >
--    void updateFromExclusiveWindow(int rank, T* object, void (T::*dumpIn)(CBufferIn&) ) 
--    {
--      size_t size ;
--      lockExclusive(rank) ;
--      updateFromLockedWindow(rank,object, dumpIn) ;
--      unlockExclusive(rank) ;
--    }
--
--    template< typename T >
--    void updateFromSharedWindow(int rank, T* object, void (T::*dumpIn)(CBufferIn&) ) 
--    {
--      size_t size ;
--      lockShared(rank) ;
--      updateFromLockedWindow(rank,object, dumpIn) ;
--      unlockShared(rank) ;
--    }
--
--    template< typename T >
--    void updateFromLockedWindow(int rank, T* object, void (T::*dumpIn)(CBufferIn&) ) 
--    {
--      size_t size ;
--
--      get(&size, SIZE_BUFFER_SIZE, MPI_CHAR, rank, OFFSET_BUFFER_SIZE, SIZE_BUFFER_SIZE, MPI_CHAR) ;
--      flush(rank) ;
--      CBufferIn buffer(size) ;
--      get(buffer.start(), size, MPI_CHAR, rank,OFFSET_BUFFER, size, MPI_CHAR) ;
--      flush(rank) ;
--
--      (object->*dumpIn)(buffer) ;
--    }
--
--
--
--    template< class T >
--    void pushToWindow(int rank, T* object, void (T::*dumpOut)(CBufferOut&) )
--    {
--      pushToExclusiveWindow(rank, object, dumpOut) ;
--    }
--
--    template< class T >
--    void pushToExclusiveWindow(int rank, T* object, void (T::*dumpOut)(CBufferOut&) )
--    {
--      lockExclusive(rank) ;
--      pushToLockedWindow(rank, object, dumpOut) ;
--      unlockExclusive(rank) ;
--    }
--
--    template< class T >
--    void pushToSharedWindow(int rank, T* object, void (T::*dumpOut)(CBufferOut&) )
--    {
--      lockShared(rank) ;
--      pushToLockedWindow(rank, object, dumpOut) ;
--      unlockShared(rank) ;
--    }
--
--    template< class T >
--    void pushToLockedWindow(int rank, T* object, void (T::*dumpOut)(CBufferOut&) )
--    {
--      size_t size ;
--      get(&size, SIZE_BUFFER_SIZE, MPI_CHAR, rank, OFFSET_BUFFER_SIZE, SIZE_BUFFER_SIZE, MPI_CHAR) ;
--      flush(rank) ;
--      CBufferOut buffer ;
--      (object->*dumpOut)(buffer) ;
--      size_t bufferSize=buffer.count() ;
--      size_t newSize = size + bufferSize;
--      put(&newSize, SIZE_BUFFER_SIZE, MPI_CHAR, rank, OFFSET_BUFFER_SIZE, SIZE_BUFFER_SIZE, MPI_CHAR) ;
--      put(buffer.start(), bufferSize, MPI_CHAR, rank, OFFSET_BUFFER+size, bufferSize, MPI_CHAR) ;
--      flush(rank) ;
--    }
--
--
--
--    template< typename T >
--    void popFromWindow(int rank, T* object, void (T::*dumpIn)(CBufferIn&) ) 
--    {
--      popFromExclusiveWindow(rank,object, dumpIn) ; 
--    }
--
--    template< typename T >
--    void popFromExclusiveWindow(int rank, T* object, void (T::*dumpIn)(CBufferIn&) ) 
--    {
--      lockExclusive(rank) ;
--      popFromLockedWindow(rank,object, dumpIn) ; 
--      unlockExclusive(rank) ;
--      
--    }
--
--    template< typename T >
--    void popFromSharedWindow(int rank, T* object, void (T::*dumpIn)(CBufferIn&) ) 
--    {
--      lockShared(rank) ;
--      popFromLockedWindow(rank,object, dumpIn) ; 
--      unlockShared(rank) ;
--    }
--
--    template< typename T >
--    void popFromLockedWindow(int rank, T* object, void (T::*dumpIn)(CBufferIn&) ) 
--    {
--      size_t size ;
--      get(&size, SIZE_BUFFER_SIZE, MPI_CHAR, rank, OFFSET_BUFFER_SIZE, SIZE_BUFFER_SIZE, MPI_CHAR) ;
--      flush(rank) ;
--      CBufferIn buffer(size) ;
--      get(buffer.start(), size, MPI_CHAR, rank,OFFSET_BUFFER, size, MPI_CHAR) ;
--      flush(rank) ;
--      (object->*dumpIn)(buffer) ;
--      
--      size=buffer.remain() ;
--      put(&size, SIZE_BUFFER_SIZE, MPI_CHAR, rank, OFFSET_BUFFER_SIZE, SIZE_BUFFER_SIZE, MPI_CHAR) ;
--      put(buffer.ptr(),buffer.remain(), MPI_CHAR, rank, OFFSET_BUFFER, buffer.remain(), MPI_CHAR) ;
--      flush(rank) ;
--    }
--
--    ~CWindowManager()
--    {
--    }
--  } ;
--}
--
--
--
--#endif
-\ No newline at end of file
-+#ifndef __WINDOW_MANAGER_HPP__
-+#define __WINDOW_MANAGER_HPP__
-+
-+#include <map>
-+#include "mpi.hpp"
-+#include "buffer_in.hpp"
-+#include "buffer_out.hpp"
-+#include "message.hpp"
-+
-+namespace xios
-+{
-+
-+
-+  class CWindowManager
-+  {
-+
-+    private :
-+    const MPI_Aint OFFSET_LOCK=0 ;
-+    const int SIZE_LOCK=sizeof(int) ;
-+    const MPI_Aint OFFSET_BUFFER_SIZE=OFFSET_LOCK+SIZE_LOCK ;
-+    const int SIZE_BUFFER_SIZE=sizeof(size_t) ;
-+    const MPI_Aint OFFSET_BUFFER=OFFSET_BUFFER_SIZE+SIZE_BUFFER_SIZE ;
-+    const int WINDOWS_LOCKED=-1 ;
-+
-+    MPI_Win window_ ;
-+    void * winBuffer_ ;
-+    map<int,double> lastTimeLock_ ;
-+    const double latency_=0e-2 ; 
-+
-+    public :
-+
-+    CWindowManager(MPI_Comm winComm, size_t bufferSize, const string name)
-+    {
-+      const MPI_Aint windowSize=bufferSize+OFFSET_BUFFER ;
-+      MPI_Win_allocate(windowSize, 1, MPI_INFO_NULL, winComm, &winBuffer_, &window_) ;
-+      int lock=0 ;
-+      size_t size=0 ;
-+      int commRank ;
-+      MPI_Comm_rank(winComm, &commRank) ;
-+      MPI_Win_lock(MPI_LOCK_EXCLUSIVE, commRank, 0, window_) ;
-+      MPI_Put(&lock, SIZE_LOCK, MPI_CHAR, commRank, OFFSET_LOCK, SIZE_LOCK, MPI_CHAR, window_) ;
-+      MPI_Put(&size, SIZE_BUFFER_SIZE, MPI_CHAR, commRank, OFFSET_BUFFER_SIZE, SIZE_BUFFER_SIZE, MPI_CHAR, window_) ;
-+      MPI_Win_unlock(commRank, window_) ;
-+      MPI_Barrier(winComm) ;
-+    }
-+    
-+    void lockWindow(int rank, int state )
-+    {
-+      int lock=state ;
-+      double time ;
-+      auto it=lastTimeLock_.find(rank) ;
-+      if (it == lastTimeLock_.end()) 
-+      { 
-+        lastTimeLock_[rank] = 0. ; 
-+        it=lastTimeLock_.find(rank) ;
-+      }
-+      double& lastTime = it->second ;
-+
-+      do 
-+      {
-+        time=MPI_Wtime() ;
-+        while(time-lastTime < latency_) time=MPI_Wtime() ;
-+        int flag ;
-+        MPI_Iprobe(MPI_ANY_SOURCE, MPI_ANY_TAG, MPI_COMM_WORLD, &flag, MPI_STATUS_IGNORE);
-+        MPI_Win_lock(MPI_LOCK_EXCLUSIVE, rank, 0, window_) ;
-+        MPI_Compare_and_swap(&WINDOWS_LOCKED, &state, &lock, MPI_INT, rank, OFFSET_LOCK, window_) ;
-+        MPI_Win_unlock(rank, window_) ;
-+        lastTime=MPI_Wtime() ;
-+      } while (lock!=state) ;
-+      
-+      
-+    }
-+
-+    void lockWindowExclusive(int rank, int state )
-+    {
-+      int lock=state ;
-+      double time ;
-+      auto it=lastTimeLock_.find(rank) ;
-+      if (it == lastTimeLock_.end()) 
-+      { 
-+        lastTimeLock_[rank] = 0. ; 
-+        it=lastTimeLock_.find(rank) ;
-+      }
-+      double& lastTime = it->second ;
-+
-+      do 
-+      {
-+        time=MPI_Wtime() ;
-+        while(time-lastTime < latency_) time=MPI_Wtime() ;
-+        int flag ;
-+        MPI_Iprobe(MPI_ANY_SOURCE, MPI_ANY_TAG, MPI_COMM_WORLD, &flag, MPI_STATUS_IGNORE);
-+        MPI_Win_lock(MPI_LOCK_EXCLUSIVE, rank, 0, window_) ;
-+        MPI_Compare_and_swap(&WINDOWS_LOCKED, &state, &lock, MPI_INT, rank, OFFSET_LOCK, window_) ;
-+        MPI_Win_unlock(rank, window_) ;
-+        lastTime=MPI_Wtime() ;
-+      } while (lock!=state) ;
-+    }
-+
-+    void lockWindowExclusive(int rank)
-+    {
-+      MPI_Win_lock(MPI_LOCK_EXCLUSIVE, rank, 0, window_) ;
-+    }
-+
-+    void lockWindowShared(int rank)
-+    {
-+      MPI_Win_lock(MPI_LOCK_SHARED, rank, 0, window_) ;
-+    }
-+
-+    void unlockWindow(int rank)
-+    {
-+      MPI_Win_unlock(rank, window_) ;
-+    }
-+
-+    void flushWindow(int rank)
-+    {
-+      MPI_Win_flush(rank, window_) ;
-+    }
-+
-+    void unlockWindow(int rank, int state )
-+    {
-+      int lock ;
-+      MPI_Win_lock(MPI_LOCK_EXCLUSIVE, rank, 0, window_) ;
-+      MPI_Compare_and_swap(&state, &WINDOWS_LOCKED, &lock, MPI_INT, rank, OFFSET_LOCK, window_) ;
-+      MPI_Win_unlock(rank, window_) ;
-+    }
-+    
-+    template< class T >
-+    void updateToWindow(int rank, T* object, void (T::*dumpOut)(CBufferOut&) )
-+    {
-+      CBufferOut buffer ;
-+      (object->*dumpOut)(buffer) ;
-+      size_t size=buffer.count() ;
-+      MPI_Win_lock(MPI_LOCK_EXCLUSIVE, rank, 0, window_) ;
-+      MPI_Put(&size, SIZE_BUFFER_SIZE, MPI_CHAR, rank, OFFSET_BUFFER_SIZE, SIZE_BUFFER_SIZE, MPI_CHAR, window_) ;
-+      MPI_Put(buffer.start(), size, MPI_CHAR, rank,OFFSET_BUFFER, size, MPI_CHAR, window_) ;
-+      MPI_Win_unlock(rank, window_) ;
-+    }
-+
-+    template< class T >
-+    void updateToExclusiveWindow(int rank, T* object, void (T::*dumpOut)(CBufferOut&) )
-+    {
-+      CBufferOut buffer ;
-+      (object->*dumpOut)(buffer) ;
-+      size_t size=buffer.count() ;
-+      MPI_Win_lock(MPI_LOCK_EXCLUSIVE, rank, 0, window_) ;
-+      MPI_Put(&size, SIZE_BUFFER_SIZE, MPI_CHAR, rank, OFFSET_BUFFER_SIZE, SIZE_BUFFER_SIZE, MPI_CHAR, window_) ;
-+      MPI_Put(buffer.start(), size, MPI_CHAR, rank,OFFSET_BUFFER, size, MPI_CHAR, window_) ;
-+      MPI_Win_unlock(rank, window_) ;
-+    }
-+
-+    template< class T >
-+    void updateTosharedWindow(int rank, T* object, void (T::*dumpOut)(CBufferOut&) )
-+    {
-+      CBufferOut buffer ;
-+      (object->*dumpOut)(buffer) ;
-+      size_t size=buffer.count() ;
-+      MPI_Win_lock(MPI_LOCK_SHARED, rank, 0, window_) ;
-+      MPI_Put(&size, SIZE_BUFFER_SIZE, MPI_CHAR, rank, OFFSET_BUFFER_SIZE, SIZE_BUFFER_SIZE, MPI_CHAR, window_) ;
-+      MPI_Put(buffer.start(), size, MPI_CHAR, rank,OFFSET_BUFFER, size, MPI_CHAR, window_) ;
-+      MPI_Win_unlock(rank, window_) ;
-+    }
-+
-+    template< class T >
-+    void updateToLockedWindow(int rank, T* object, void (T::*dumpOut)(CBufferOut&) )
-+    {
-+      CBufferOut buffer ;
-+      (object->*dumpOut)(buffer) ;
-+      size_t size=buffer.count() ;
-+//      MPI_Win_lock(MPI_LOCK_EXCLUSIVE, rank, 0, window_) ;
-+      MPI_Put(&size, SIZE_BUFFER_SIZE, MPI_CHAR, rank, OFFSET_BUFFER_SIZE, SIZE_BUFFER_SIZE, MPI_CHAR, window_) ;
-+      MPI_Put(buffer.start(), size, MPI_CHAR, rank,OFFSET_BUFFER, size, MPI_CHAR, window_) ;
-+      MPI_Win_flush(rank, window_) ;
-+//      MPI_Win_unlock(rank, window_) ;
-+    }
-+
-+    template< typename T >
-+    void updateFromWindow(int rank, T* object, void (T::*dumpIn)(CBufferIn&) ) 
-+    {
-+      size_t size ;
-+      MPI_Win_lock(MPI_LOCK_EXCLUSIVE, rank, 0, window_) ;
-+      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_unlock(rank, window_) ;
-+      (object->*dumpIn)(buffer) ;
-+    }
-+
-+    template< typename T >
-+    void updateFromExclusiveWindow(int rank, T* object, void (T::*dumpIn)(CBufferIn&) ) 
-+    {
-+      size_t size ;
-+      MPI_Win_lock(MPI_LOCK_EXCLUSIVE, rank, 0, window_) ;
-+      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_unlock(rank, window_) ;
-+      (object->*dumpIn)(buffer) ;
-+    }
-+
-+    template< typename T >
-+    void updateFromSharedWindow(int rank, T* object, void (T::*dumpIn)(CBufferIn&) ) 
-+    {
-+      size_t size ;
-+      MPI_Win_lock(MPI_LOCK_SHARED, rank, 0, window_) ;
-+      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_unlock(rank, window_) ;
-+      (object->*dumpIn)(buffer) ;
-+    }
-+
-+    template< typename T >
-+    void updateFromLockedWindow(int rank, T* object, void (T::*dumpIn)(CBufferIn&) ) 
-+    {
-+      size_t size ;
-+//      MPI_Win_lock(MPI_LOCK_SHARED, rank, 0, window_) ;
-+      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_unlock(rank, window_) ;
-+      MPI_Win_flush(rank, window_) ;
-+      (object->*dumpIn)(buffer) ;
-+    }
-+
-+
-+    template< class T >
-+    void pushToWindow(int rank, T* object, void (T::*dumpOut)(CBufferOut&) )
-+    {
-+      size_t size ;
-+      MPI_Win_lock(MPI_LOCK_EXCLUSIVE, rank, 0, window_) ;
-+      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_) ;
-+      MPI_Win_unlock(rank, window_) ;
-+    }
-+
-+    template< class T >
-+    void pushToExclusiveWindow(int rank, T* object, void (T::*dumpOut)(CBufferOut&) )
-+    {
-+      size_t size ;
-+      MPI_Win_lock(MPI_LOCK_EXCLUSIVE, rank, 0, window_) ;
-+      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_) ;
-+      MPI_Win_unlock(rank, window_) ;
-+    }
-+
-+    template< class T >
-+    void pushToSharedWindow(int rank, T* object, void (T::*dumpOut)(CBufferOut&) )
-+    {
-+      size_t size ;
-+      MPI_Win_lock(MPI_LOCK_SHARED, rank, 0, window_) ;
-+      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_) ;
-+      MPI_Win_unlock(rank, window_) ;
-+    }
-+
-+    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_) ;
-+      MPI_Win_flush(rank, window_) ;
-+    }
-+
-+    template< typename T >
-+    void popFromWindow(int rank, T* object, void (T::*dumpIn)(CBufferIn&) ) 
-+    {
-+      size_t size ;
-+      MPI_Win_lock(MPI_LOCK_EXCLUSIVE, rank, 0, window_) ;
-+      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_) ;
-+      MPI_Win_unlock(rank, window_) ;
-+      
-+    }
-+
-+    template< typename T >
-+    void popFromExclusiveWindow(int rank, T* object, void (T::*dumpIn)(CBufferIn&) ) 
-+    {
-+      size_t size ;
-+      MPI_Win_lock(MPI_LOCK_EXCLUSIVE, rank, 0, window_) ;
-+      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_) ;
-+      MPI_Win_unlock(rank, window_) ;
-+      
-+    }
-+
-+    template< typename T >
-+    void popFromSharedWindow(int rank, T* object, void (T::*dumpIn)(CBufferIn&) ) 
-+    {
-+      size_t size ;
-+      MPI_Win_lock(MPI_LOCK_SHARED, rank, 0, window_) ;
-+      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_) ;
-+      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_) ;
-+      MPI_Win_flush(rank, window_) ;
-+    }
-+
-+    ~CWindowManager()
-+    {
-+      MPI_Win_free(&window_) ;
-+    }
-+  } ;
-+}
-+
-+
-+
-+#endif