Changeset 2661 for XIOS3

Timestamp:

10/04/24 09:58:26 (4 months ago)

Author:

jderouillat

Message:

In case of notifications using MPI_Windows, avoid remote access if information is locally available. Fix a type in notifyOutType_ initialisation on CServices.

Location:

XIOS3/dev/XIOS_NOTIFICATIONS_MANAGER/src/manager

Files:

• contexts_manager.cpp (modified) (1 diff)
• ressources_manager.cpp (modified) (1 diff)
• services.cpp (modified) (1 diff)
• services_manager.cpp (modified) (2 diffs)

XIOS3/dev/XIOS_NOTIFICATIONS_MANAGER/src/manager/contexts_manager.cpp

@@ -257 +257 @@
     if (commRank==0)
     {
-
-      if (useWindowManager_) winContexts_->updateFromSharedWindow(managerGlobalLeader_, this, &CContextsManager::contextsDumpIn) ;
-
       auto it=contexts_.find(fullContextId) ;
+      if ( it == contexts_.end())
+      {
+        if (useWindowManager_) winContexts_->updateFromSharedWindow(managerGlobalLeader_, this, &CContextsManager::contextsDumpIn) ;
+      }
+      
+      it=contexts_.find(fullContextId) ;
       if ( it == contexts_.end()) ret=false ;
       else

XIOS3/dev/XIOS_NOTIFICATIONS_MANAGER/src/manager/ressources_manager.cpp

@@ -338 +338 @@
   bool CRessourcesManager::getPoolInfo(const string& poolId, int& size, int& freeSize, int& leader)
   {
-    if (useWindowManager_) winRessources_->updateFromSharedWindow(managerGlobalLeader_, this, &CRessourcesManager::ressourcesDumpIn) ;
- 
     auto it=pools_.find(poolId) ;
+    if ( it == pools_.end())
+    {
+      if (useWindowManager_) winRessources_->updateFromSharedWindow(managerGlobalLeader_, this, &CRessourcesManager::ressourcesDumpIn) ;
+    }
+    it=pools_.find(poolId) ;
     if ( it == pools_.end()) return false ;
     else

XIOS3/dev/XIOS_NOTIFICATIONS_MANAGER/src/manager/services.cpp

@@ -38 +38 @@
     { 
       winNotify_ = new CWindowManager(serviceComm_, maxBufferSize_,"CService::winNotify_") ;
-      notifyOutType_==NOTIFY_NOTHING ;
+      notifyOutType_=NOTIFY_NOTHING ;
       winNotify_->updateToExclusiveWindow(localRank, this, &CService::notificationsDumpOut) ;
     }

XIOS3/dev/XIOS_NOTIFICATIONS_MANAGER/src/manager/services_manager.cpp

@@ -416 +416 @@
                                         int& size, int& nbPartitions, int& leader, bool wait)
   {
-    if (useWindowManager_) winServices_->updateFromSharedWindow(managerGlobalLeader_, this, &CServicesManager::servicesDumpIn) ;
-    
-    if (wait) waitServiceRegistration(poolId, serviceId, partitionId) ;
     auto it=services_.find(std::tuple<std::string,std::string,int>(poolId,serviceId,partitionId)) ;
+    if ( it == services_.end())
+    {
+      if (useWindowManager_) winServices_->updateFromSharedWindow(managerGlobalLeader_, this, &CServicesManager::servicesDumpIn) ;
+      
+      if (wait) waitServiceRegistration(poolId, serviceId, partitionId) ;
+    }
+    it=services_.find(std::tuple<std::string,std::string,int>(poolId,serviceId,partitionId)) ;
     if ( it == services_.end()) return false ;
     else
@@ -457 +461 @@
   bool CServicesManager::hasService(const std::string& poolId, const std::string& serviceId, const int& partitionId)
   {
-    if (useWindowManager_) winServices_->updateFromSharedWindow(managerGlobalLeader_, this, &CServicesManager::servicesDumpIn) ;
-    auto it=services_.find(std::tuple<std::string, std::string, int>(poolId, serviceId, partitionId)) ;
+    auto it=services_.find(std::tuple<std::string,std::string,int>(poolId,serviceId,partitionId)) ;
+    if ( it == services_.end())
+    {
+      if (useWindowManager_) winServices_->updateFromSharedWindow(managerGlobalLeader_, this, &CServicesManager::servicesDumpIn) ;
+    }
+    it=services_.find(std::tuple<std::string, std::string, int>(poolId, serviceId, partitionId)) ;
     if ( it == services_.end()) return false ;
     else return true ;