Changeset 2246 for XIOS/dev/dev_ym/XIOS_COUPLING/src/manager/services_manager.cpp

Timestamp:

10/11/21 14:41:56 (3 years ago)

Author:

ymipsl

Message:

• Update of the tranfer protocol using one sided communication
• Introduce MPI_Improb/MPI_mrecv to listen incomming request
• Introducing latency when looping over managers

YM

File:

• XIOS/dev/dev_ym/XIOS_COUPLING/src/manager/services_manager.cpp (modified) (7 diffs)

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

@@ -7 +7 @@
 #include "server.hpp"
 #include "servers_ressource.hpp"
+#include "timer.hpp"
 
 namespace xios
@@ -55 +56 @@
     int poolSize ;
     
+    info(40)<<"CServicesManager : waiting for pool info : "<<poolId<<endl ; ;
     bool ok=CXios::getRessourcesManager()->getPoolInfo(poolId, poolSize, leader) ;
     if (wait)
@@ -67 +69 @@
     if (ok) 
     {
+      info(40)<<"CServicesManager : create service notification to leader "<<leader<<", serviceId : "<<serviceId<<", size : "<<size<<endl ;
       createServicesNotify(leader, serviceId, type, size, nbPartitions) ;
       return true ;
@@ -94 +97 @@
     {
       auto info = notifications_.front() ;
+      xios::info(40)<<"CServicesManager : receive create service notification : "<<get<0>(info)<<endl ;
       CServer::getServersRessource()->getPoolRessource()->createService(get<0>(info), get<1>(info), get<2>(info), get<3>(info)) ;
       notifications_.pop_front() ;
@@ -104 +108 @@
   void CServicesManager::eventLoop(void)
   {
-    checkCreateServicesNotification() ;
+    CTimer::get("CServicesManager::eventLoop").resume();
+    double time=MPI_Wtime() ;
+    if (time-lastEventLoop_ > eventLoopLatency_) 
+    {
+      checkCreateServicesNotification() ;
+      lastEventLoop_=time ;
+    }
+    CTimer::get("CServicesManager::eventLoop").suspend();
   }
 
@@ -176 +187 @@
   {
     
+    info(40)<<"CServicesManager : registering service, poolId : "<<poolId<<", serviceId : "<<serviceId<<endl ; ;
+
+    winServices_->lockWindowExclusive(managerGlobalLeader_) ;
+    winServices_->updateFromLockedWindow(managerGlobalLeader_, this, &CServicesManager::servicesDumpIn) ;
+    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_->unlockWindow(managerGlobalLeader_) ;
+
+/*
     winServices_->lockWindow(managerGlobalLeader_,0) ;
     winServices_->updateFromWindow(managerGlobalLeader_, this, &CServicesManager::servicesDumpIn) ;
     services_[std::tuple<std::string, std::string,int>(poolId,serviceId,partitionId)]=std::make_tuple(type,size,nbPartitions,leader) ;
     winServices_->updateToWindow(managerGlobalLeader_, this, &CServicesManager::servicesDumpOut) ;
-    winServices_->unlockWindow(managerGlobalLeader_,0) ;
+    winServices_->unlockWindow(managerGlobalLeader_,0) ;*/
   }
 
@@ -186 +207 @@
                                         int& size, int& nbPartitions, int& leader)
   {
+    
+    winServices_->lockWindowShared(managerGlobalLeader_) ;
+    winServices_->updateFromLockedWindow(managerGlobalLeader_, this, &CServicesManager::servicesDumpIn) ;
+    winServices_->unlockWindow(managerGlobalLeader_) ;
+/*
     winServices_->lockWindow(managerGlobalLeader_,0) ;
     winServices_->updateFromWindow(managerGlobalLeader_, this, &CServicesManager::servicesDumpIn) ;
-    winServices_->unlockWindow(managerGlobalLeader_,0) ;
+    winServices_->unlockWindow(managerGlobalLeader_,0) ;*/
 
     auto it=services_.find(std::tuple<std::string,std::string,int>(poolId,serviceId,partitionId)) ;