Changeset 2494 for XIOS3/trunk

Timestamp:

04/24/23 15:45:16 (14 months ago)

Author:

jderouillat

Message:

Backporting 2489 and 2490 (+ wait in getServiceInfo) from XIOS_ATTACHED + initialization of PoolRessource::notifyType_

Location:

XIOS3/trunk/src

Files:

• manager/pool_ressource.cpp (modified) (1 diff)
• manager/services_manager.cpp (modified) (4 diffs)
• node/context.cpp (modified) (1 diff)

XIOS3/trunk/src/manager/pool_ressource.cpp

@@ -26 +26 @@
     }
     
+    notifyType_=NOTIFY_NOTHING;
     winNotify_->lockWindow(commRank,0) ;
     winNotify_->updateToWindow(commRank, this, &CPoolRessource::notificationsDumpOut) ;

XIOS3/trunk/src/manager/services_manager.cpp

@@ -230 +230 @@
     int nbServices ;
     buffer>>nbServices ;
+
     for(int i=0;i<nbServices;i++) 
     {
@@ -278 +279 @@
     int size ;
     int nbPartitions;
-    return getServiceInfo(poolId, serviceId, partitionId, type, size, nbPartitions, leader) ;
+    return getServiceInfo(poolId, serviceId, partitionId, type, size, nbPartitions, leader, wait) ;
   }
 
@@ -286 +287 @@
     int nbPartitions;
     int leader;
-    return getServiceInfo(poolId, serviceId, partitionId, type, size, nbPartitions, leader) ;
+    return getServiceInfo(poolId, serviceId, partitionId, type, size, nbPartitions, leader, wait) ;
   }
 
@@ -294 +295 @@
     int type;
     int leader;
-    return getServiceInfo(poolId, serviceId, partitionId, type, size, nbPartitions, leader) ;
+    return getServiceInfo(poolId, serviceId, partitionId, type, size, nbPartitions, leader, wait) ;
   }
 

XIOS3/trunk/src/node/context.cpp

@@ -662 +662 @@
       
       int serviceType ;
-      if (intraCommRank_==0) CXios::getServicesManager()->getServiceType(poolId, serviceId, 0, serviceType) ;
+      if (intraCommRank_==0) CXios::getServicesManager()->getServiceType(poolId, serviceId, 0, serviceType, true) ;
       MPI_Bcast(&serviceType,1,MPI_INT,0,intraComm_) ;