Changeset 2498 for XIOS3/trunk/src

Timestamp:

04/27/23 10:39:26 (14 months ago)

Author:

jderouillat

Message:

Revert 2494 partially (keep initialisation of notifyType_), the associated wait managment causes deadlock in dynamico like test cases on JeanZay?

Location:

XIOS3/trunk/src

Files:

• manager/services_manager.cpp (modified) (3 diffs)
• manager/token_manager.hpp (modified) (1 diff)
• node/context.cpp (modified) (1 diff)

XIOS3/trunk/src/manager/services_manager.cpp

@@ -279 +279 @@
     int size ;
     int nbPartitions;
-    return getServiceInfo(poolId, serviceId, partitionId, type, size, nbPartitions, leader, wait) ;
+    //return getServiceInfo(poolId, serviceId, partitionId, type, size, nbPartitions, leader, wait) ;
+    return getServiceInfo(poolId, serviceId, partitionId, type, size, nbPartitions, leader) ;
   }
 
@@ -287 +288 @@
     int nbPartitions;
     int leader;
-    return getServiceInfo(poolId, serviceId, partitionId, type, size, nbPartitions, leader, wait) ;
+    //return getServiceInfo(poolId, serviceId, partitionId, type, size, nbPartitions, leader, wait) ;
+    return getServiceInfo(poolId, serviceId, partitionId, type, size, nbPartitions, leader) ;
   }
 
@@ -295 +297 @@
     int type;
     int leader;
-    return getServiceInfo(poolId, serviceId, partitionId, type, size, nbPartitions, leader, wait) ;
+    //return getServiceInfo(poolId, serviceId, partitionId, type, size, nbPartitions, leader, wait) ;
+    return getServiceInfo(poolId, serviceId, partitionId, type, size, nbPartitions, leader) ;
   }
 

XIOS3/trunk/src/manager/token_manager.hpp

@@ -22 +22 @@
         MPI_Win_allocate(windowSize, 1, MPI_INFO_NULL, comm, &winBufferCurrent_,   &winCurrentToken_) ;
         MPI_Win_allocate(windowSize, 1, MPI_INFO_NULL, comm, &winBufferRetrieved_, &winRetrievedToken_) ;
+        if (leader_== commRank) {
+          memset(   winBufferCurrent_, 0, windowSize );
+          memset( winBufferRetrieved_, 0, windowSize );
+        }
       }
 

XIOS3/trunk/src/node/context.cpp

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