Changeset 719

Timestamp:

10/05/15 15:32:52 (9 years ago)

Author:

rlacroix

Message:

Add a new configuration variable "min_buffer_size".

This allows the user to control the minimum buffer size.

Location:

XIOS/trunk/src

Files:

• cxios.cpp (modified) (2 diffs)
• cxios.hpp (modified) (1 diff)
• node/context.cpp (modified) (1 diff)

XIOS/trunk/src/cxios.cpp

@@ -26 +26 @@
   double CXios::bufferSizeFactor = 1.0;
   const double CXios::defaultBufferSizeFactor = 1.0;
+  StdSize CXios::minBufferSize = 1024 * sizeof(double);
   bool CXios::printLogs2Files;
   bool CXios::isOptPerformance = true;
@@ -61 +62 @@
 
     bufferSizeFactor = getin<double>("buffer_size_factor", defaultBufferSizeFactor);
+    minBufferSize = getin<int>("min_buffer_size", 1024 * sizeof(double));
 
     globalComm=MPI_COMM_WORLD ;

XIOS/trunk/src/cxios.hpp

@@ -42 +42 @@
      static double bufferSizeFactor; //!< Factor used to tune the buffer size
      static const double defaultBufferSizeFactor; //!< Default factor value
+     static StdSize minBufferSize; //!< Minimum buffer size
      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

XIOS/trunk/src/node/context.cpp

@@ -266 +266 @@
    void CContext::setClientServerBuffer()
    {
-     size_t bufferSizeMin = 10 * sizeof(size_t) * 1024;
+     size_t bufferSizeMin = CXios::minBufferSize;
 #define DECLARE_NODE(Name_, name_)    \
-     bufferSizeMin = (bufferSizeMin < sizeof(C##Name_##Definition)) ?  sizeof(C##Name_##Definition) : bufferSizeMin;
+     if (bufferSizeMin < sizeof(C##Name_##Definition)) bufferSizeMin = sizeof(C##Name_##Definition);
 #define DECLARE_NODE_PAR(Name_, name_)
 #include "node_type.conf"
+#undef DECLARE_NODE
+#undef DECLARE_NODE_PAR
+
      std::map<int, StdSize> bufferSize = getDataSize();
      if (bufferSize.empty())