Changeset 2507 for XIOS3/trunk/src/manager/services_manager.cpp

Timestamp:

06/01/23 10:58:08 (13 months ago)

Author:

ymipsl

Message:

Merging XIOS3_ATTACHED branch into XIOS3 trunk.

YM

File:

• XIOS3/trunk/src/manager/services_manager.cpp (modified) (6 diffs)

XIOS3/trunk/src/manager/services_manager.cpp

@@ -227 +227 @@
     int leader ;
 
-    services_.clear() ;
     int nbServices ;
     buffer>>nbServices ;
+    bool newServices = nbServices != services_.size() ; 
+
+    services_.clear() ;
 
     for(int i=0;i<nbServices;i++) 
@@ -235 +237 @@
       buffer>>poolId>>serviceId>>partitionId>>type>>size>>nbPartitions>>leader ;
       services_[std::tuple<std::string,std::string,int>(poolId,serviceId,partitionId)]=std::make_tuple(type,size,nbPartitions,leader) ;
+      if (newServices)
+        info(40)<<"Receive new services informations : "<<poolId<<"::"<<serviceId<<"::"<<partitionId<<" => type : "<<type<<"  size : "<<size<<"  nbPartitions : "<<nbPartitions<<"  leader : "<<leader<<endl ;
     }
   }
@@ -256 +260 @@
                                         int& size, int& nbPartitions, int& leader, bool wait)
   {
-    
     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)) ;
-    if ( it == services_.end() && !wait) return false ;
+    if ( it == services_.end()) return false ;
     else
     {
-      if (wait) waitServiceRegistration(poolId, serviceId, partitionId) ;
       type= std::get<0>(it->second); 
       size= std::get<1>(it->second); 
@@ -279 +282 @@
     int size ;
     int nbPartitions;
-    //return getServiceInfo(poolId, serviceId, partitionId, type, size, nbPartitions, leader, wait) ;
-    return getServiceInfo(poolId, serviceId, partitionId, type, size, nbPartitions, leader) ;
+    return getServiceInfo(poolId, serviceId, partitionId, type, size, nbPartitions, leader, wait) ;
   }
 
@@ -288 +290 @@
     int nbPartitions;
     int leader;
-    //return getServiceInfo(poolId, serviceId, partitionId, type, size, nbPartitions, leader, wait) ;
-    return getServiceInfo(poolId, serviceId, partitionId, type, size, nbPartitions, leader) ;
+    return getServiceInfo(poolId, serviceId, partitionId, type, size, nbPartitions, leader, wait) ;
   }
 
@@ -297 +298 @@
     int type;
     int leader;
-    //return getServiceInfo(poolId, serviceId, partitionId, type, size, nbPartitions, leader, wait) ;
-    return getServiceInfo(poolId, serviceId, partitionId, type, size, nbPartitions, leader) ;
+    return getServiceInfo(poolId, serviceId, partitionId, type, size, nbPartitions, leader, wait) ;
   }
 
   bool CServicesManager::hasService(const std::string& poolId, const std::string& serviceId, const int& partitionId)
   {
-    winServices_->lockWindow(managerGlobalLeader_,0) ;
-    winServices_->updateFromWindow(managerGlobalLeader_, this, &CServicesManager::servicesDumpIn) ;
-    winServices_->unlockWindow(managerGlobalLeader_,0) ;
+    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 ;