Changeset 1029

Timestamp:

01/13/17 11:44:00 (7 years ago)

Author:

rlacroix

Message:

Make the timeout for xios_recv_field configurable.

The new option "recv_field_timeout" can now be used to set the timeout expressed in seconds. Default value is still 10s.

Location:

XIOS/trunk/src

Files:

• cxios.cpp (modified) (2 diffs)
• cxios.hpp (modified) (1 diff)
• filter/store_filter.cpp (modified) (1 diff)

XIOS/trunk/src/cxios.cpp

@@ -30 +30 @@
   bool CXios::isOptPerformance = true;
   CRegistry* CXios::globalRegistry = 0;
+  double CXios::recvFieldTimeout = 10.0;
 
   //! Parse configuration file and create some objects from it
@@ -63 +64 @@
     bufferSizeFactor = getin<double>("buffer_size_factor", defaultBufferSizeFactor);
     minBufferSize = getin<int>("min_buffer_size", 1024 * sizeof(double));
+    recvFieldTimeout = getin<double>("recv_field_timeout", 10.0);
+    if (recvFieldTimeout < 0.0)
+      ERROR("CXios::parseXiosConfig()", "recv_field_timeout cannot be negative.");
 
     globalComm=MPI_COMM_WORLD ;

XIOS/trunk/src/cxios.hpp

@@ -45 +45 @@
      static bool isOptPerformance; //!< Check if buffer size is for performance (as large as possible)
      static CRegistry* globalRegistry ; //!< global registry which is wrote by the root process of the servers
+     static double recvFieldTimeout; //!< Time to wait for data before issuing an error when receiving a field
 
     public:

XIOS/trunk/src/filter/store_filter.cpp

@@ -24 +24 @@
     CTimer timer("CStoreFilter::getPacket");
     CConstDataPacketPtr packet;
-    const double timeout = 10 ; // 10 seconds timeout
+    const double timeout = CXios::recvFieldTimeout;
 
     do