Changeset 2458 for XIOS3/trunk/src/manager/services_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/services_manager.cpp (modified) (11 diffs)

XIOS3/trunk/src/manager/services_manager.cpp

@@ -54 +54 @@
 
     int leader ;
-    int poolSize ;
+    int poolSize, poolFreeSize ;
     
     info(40)<<"CServicesManager : waiting for pool info : "<<poolId<<endl ; ;
-    bool ok=CXios::getRessourcesManager()->getPoolInfo(poolId, poolSize, leader) ;
+    bool ok=CXios::getRessourcesManager()->getPoolInfo(poolId, poolSize, poolFreeSize, leader) ;
     if (wait)
     {
@@ -63 +63 @@
       {
         CXios::getDaemonsManager()->eventLoop() ;
-        ok=CXios::getRessourcesManager()->getPoolInfo(poolId, poolSize, leader) ;
+        ok=CXios::getRessourcesManager()->getPoolInfo(poolId, poolSize, poolFreeSize, leader) ;
       }
     }
@@ -70 +70 @@
     {
       info(40)<<"CServicesManager : create service notification to leader "<<leader<<", serviceId : "<<serviceId<<", size : "<<size<<endl ;
+      CXios::getRessourcesManager()->decreasePoolFreeSize(poolId ,size) ;
       createServicesNotify(leader, serviceId, type, size, nbPartitions) ;
       return true ;
@@ -81 +82 @@
     int leader ;
     int poolSize ;
+    int poolFreeSize ;
     
     info(40)<<"CServicesManager : waiting for pool info : "<<poolId<<endl ; ;
-    bool ok=CXios::getRessourcesManager()->getPoolInfo(poolId, poolSize, leader) ;
+    bool ok=CXios::getRessourcesManager()->getPoolInfo(poolId, poolSize, poolFreeSize, leader) ;
     if (wait)
     {
@@ -89 +91 @@
       {
         CXios::getDaemonsManager()->eventLoop() ;
-        ok=CXios::getRessourcesManager()->getPoolInfo(poolId, poolSize, leader) ;
+        ok=CXios::getRessourcesManager()->getPoolInfo(poolId, poolSize, poolFreeSize, leader) ;
       }
     }
@@ -251 +253 @@
 
   bool CServicesManager::getServiceInfo(const std::string& poolId, const std::string& serviceId, const int& partitionId, int& type, 
-                                        int& size, int& nbPartitions, int& leader)
+                                        int& size, int& nbPartitions, int& leader, bool wait)
   {
     
@@ -259 +261 @@
 
     auto it=services_.find(std::tuple<std::string,std::string,int>(poolId,serviceId,partitionId)) ;
-    if ( it == services_.end()) return false ;
+    if ( it == services_.end() && !wait) return false ;
     else
     {
+      if (wait) waitServiceRegistration(poolId, serviceId, partitionId) ;
       type= std::get<0>(it->second); 
       size= std::get<1>(it->second); 
@@ -270 +273 @@
   }
 
-  bool CServicesManager::getServiceLeader(const std::string& poolId, const std::string& serviceId, const int& partitionId, int& leader)
+  bool CServicesManager::getServiceLeader(const std::string& poolId, const std::string& serviceId, const int& partitionId, int& leader, bool wait)
   {
     int type;
@@ -278 +281 @@
   }
 
-  bool CServicesManager::getServiceType(const std::string& poolId, const std::string& serviceId, const int& partitionId, int& type)
+  bool CServicesManager::getServiceType(const std::string& poolId, const std::string& serviceId, const int& partitionId, int& type, bool wait)
   {
     int size ;
@@ -286 +289 @@
   }
 
-  bool CServicesManager::getServiceNbPartitions(const std::string& poolId, const std::string& serviceId, const int& partitionId, int& nbPartitions)
+  bool CServicesManager::getServiceNbPartitions(const std::string& poolId, const std::string& serviceId, const int& partitionId, int& nbPartitions, bool wait)
   {
     int size ;
@@ -303 +306 @@
     else return true ;
   }
+ 
+  void CServicesManager::waitServiceRegistration(const std::string& poolId, const std::string& serviceId, const int& partitionId)
+  {
+    while(!hasService(poolId,serviceId,partitionId)) CXios::getDaemonsManager()->servicesEventLoop() ;
+  }
 
 }