Changeset 2458 for XIOS3/trunk/src/manager/ressources_manager.cpp

Timestamp:

01/25/23 16:59:46 (17 months ago)

Author:

ymipsl

Message:

Merge XIOS_FILE_SERVICE dev branch into trunk

YM

Location:

XIOS3/trunk

Files:

• . (modified) (1 prop)
• src/manager/ressources_manager.cpp (modified) (10 diffs)

XIOS3/trunk/src/manager/ressources_manager.cpp

@@ -2 +2 @@
 #include "server.hpp"
 #include "servers_ressource.hpp"
+#include "token_manager.hpp"
 #include "timer.hpp"
 
@@ -21 +22 @@
     if (commRank==0 && isXiosServer) MPI_Comm_rank(xiosComm_, &commRank) ; 
     else commRank=0 ;
+    tokenManager_ = new CTokenManager(xiosComm_,commRank) ;
+
     MPI_Allreduce(&commRank, &managerGlobalLeader_, 1, MPI_INT, MPI_SUM, xiosComm_) ;
 
@@ -163 +166 @@
     buffer.realloc(maxBufferSize_) ;
     
-    buffer<<serverLeader_ ;  
+    buffer<<ressourcesSize_<<freeRessourcesSize_<<serverLeader_ ;  
     buffer<<(int) pools_.size();
     for(auto it=pools_.begin();it!=pools_.end(); ++it)
@@ -169 +172 @@
       auto key = it->first ;
       auto val = it->second ; 
-      buffer << key<<std::get<0>(val) << std::get<1>(val)  ;
+      buffer << key<<std::get<0>(val)  << std::get<1>(val)  << std::get<2>(val);
     }
   }
@@ -177 +180 @@
     std::string poolId ;
     int size ;
+    int freeSize ;
     int leader ;
    
-    buffer>>serverLeader_ ;
+    buffer>>ressourcesSize_>>freeRessourcesSize_>>serverLeader_ ;
     pools_.clear() ;
     int nbPools ;
@@ -185 +189 @@
     for(int i=0;i<nbPools;i++) 
     {
-      buffer>>poolId>>size>>leader ;
-      pools_[poolId]=std::make_tuple(size,leader) ;
+      buffer>>poolId>>size>>freeSize>>leader ;
+      pools_[poolId]=std::make_tuple(size, freeSize, leader) ;
     }
   }
@@ -210 +214 @@
 
  
-  void CRessourcesManager::registerPool(const string& poolId, int size, int leader)
-  {
-    winRessources_->lockWindow(managerGlobalLeader_,0) ;
-    winRessources_->updateFromWindow(managerGlobalLeader_, this, &CRessourcesManager::ressourcesDumpIn) ;
-    pools_[poolId] = make_tuple(size,leader) ;
+  void CRessourcesManager::registerPoolClient(const string& poolId, int size, int leader)
+  {
+    winRessources_->lockWindow(managerGlobalLeader_,0) ;
+    winRessources_->updateFromWindow(managerGlobalLeader_, this, &CRessourcesManager::ressourcesDumpIn) ;
+    pools_[poolId] = make_tuple(size, size, leader) ;
+    winRessources_->updateToWindow(managerGlobalLeader_, this, &CRessourcesManager::ressourcesDumpOut) ;
+    winRessources_->unlockWindow(managerGlobalLeader_,0) ;    
+  }
+
+  void CRessourcesManager::registerPoolServer(const string& poolId, int size, int leader)
+  {
+    winRessources_->lockWindow(managerGlobalLeader_,0) ;
+    winRessources_->updateFromWindow(managerGlobalLeader_, this, &CRessourcesManager::ressourcesDumpIn) ;
+    pools_[poolId] = make_tuple(size, size, leader) ;
     freeRessourcesSize_-=size ;
     winRessources_->updateToWindow(managerGlobalLeader_, this, &CRessourcesManager::ressourcesDumpOut) ;
@@ -220 +233 @@
   }
 
-
-  bool CRessourcesManager::getPoolInfo(const string& poolId, int& size, int& leader)
+  bool CRessourcesManager::getPoolInfo(const string& poolId, int& size, int& freeSize, int& leader)
   {
     winRessources_->lockWindow(managerGlobalLeader_,0) ;
@@ -232 +244 @@
     {
       size=get<0>(it->second) ;
-      leader=get<1>(it->second) ;
+      freeSize=get<1>(it->second) ;
+      leader=get<2>(it->second) ;
       return true ;
     }
+  }
+
+  bool CRessourcesManager::decreasePoolFreeSize(const string& poolId, int size)
+  {
+    bool ret ;
+
+    winRessources_->lockWindow(managerGlobalLeader_,0) ;
+    winRessources_->updateFromWindow(managerGlobalLeader_, this, &CRessourcesManager::ressourcesDumpIn) ;
+   
+
+    auto it=pools_.find(poolId) ;
+    
+    if ( it == pools_.end()) ret=false ;
+    else 
+    {
+      get<1>(it->second)-=size ;
+      ret=true ;
+    }
+    winRessources_->updateToWindow(managerGlobalLeader_, this, &CRessourcesManager::ressourcesDumpOut) ;
+    winRessources_->unlockWindow(managerGlobalLeader_,0) ; 
+
+    return ret ;   
   }
 
@@ -257 +292 @@
   bool CRessourcesManager::getPoolLeader(const string& poolId, int& leader)
   {
-    int size ;
-    return getPoolInfo(poolId, size, leader) ;
+    int size, freeSize ;
+    return getPoolInfo(poolId, size, freeSize, leader) ;
   }
 
   bool CRessourcesManager::getPoolSize(const string& poolId, int& size)
   {
-    int leader ;
-    return getPoolInfo(poolId, size, leader) ;
+    int leader,freeSize ;
+    return getPoolInfo(poolId, size, freeSize, leader) ;
+  }
+
+  bool CRessourcesManager::getPoolFreeSize(const string& poolId, int& freeSize)
+  {
+    int leader,size ;
+    return getPoolInfo(poolId, size, freeSize, leader) ;
   }
 
   bool CRessourcesManager::hasPool(const string& poolId)
   {
-    int leader,size ;
-    return getPoolInfo(poolId, size, leader) ;
+    int leader,size,freeSize ;
+    return getPoolInfo(poolId, size, freeSize, leader) ;
+  }
+
+  void CRessourcesManager::waitPoolRegistration(const string& poolId)
+  {
+    while(!hasPool(poolId)) CXios::getDaemonsManager()->servicesEventLoop() ;
   }
 }