Changeset 1201 for XIOS/dev/dev_olga/src/context_client.cpp

Timestamp:

07/07/17 18:17:49 (7 years ago)

Author:

oabramkina

Message:

Two server levels: merging trunk r1200 (except for non-contiguous zoom) into dev. Tested on Curie. Todo: non-contiguous zoom.

File:

• XIOS/dev/dev_olga/src/context_client.cpp (modified) (3 diffs)

XIOS/dev/dev_olga/src/context_client.cpp

@@ -246 +246 @@
    void CContextClient::newBuffer(int rank)
    {
-     if (!mapBufferSize_.count(rank))
-     {
-//       error(0) << "WARNING: Unexpected request for buffer to communicate with server " << rank << std::endl;
-       mapBufferSize_[rank] = CXios::minBufferSize;
-     }
-     CClientBuffer* buffer = buffers[rank] = new CClientBuffer(interComm, rank, mapBufferSize_[rank], maxBufferedEvents);
-     // Notify the server
-     CBufferOut* bufOut = buffer->getBuffer(sizeof(StdSize));
-     bufOut->put(mapBufferSize_[rank]); // Stupid C++
-     buffer->checkBuffer();
+      if (!mapBufferSize_.count(rank))
+      {
+        error(0) << "WARNING: Unexpected request for buffer to communicate with server " << rank << std::endl;
+        mapBufferSize_[rank] = CXios::minBufferSize;
+        maxEventSizes[rank] = CXios::minBufferSize;
+      }
+      CClientBuffer* buffer = buffers[rank] = new CClientBuffer(interComm, rank, mapBufferSize_[rank], maxEventSizes[rank], maxBufferedEvents);
+      // Notify the server
+      CBufferOut* bufOut = buffer->getBuffer(sizeof(StdSize));
+      bufOut->put(mapBufferSize_[rank]); // Stupid C++
+      buffer->checkBuffer();
    }
 
@@ -304 +305 @@
    {
      mapBufferSize_ = mapSize;
+     maxEventSizes = maxEventSize;
 
      // Compute the maximum number of events that can be safely buffered.
@@ -315 +317 @@
 
      if (minBufferSizeEventSizeRatio < 1.0)
+     {
        ERROR("void CContextClient::setBufferSize(const std::map<int,StdSize>& mapSize, const std::map<int,StdSize>& maxEventSize)",
              << "The buffer sizes and the maximum events sizes are incoherent.");
+     }
+     else if (minBufferSizeEventSizeRatio == std::numeric_limits<double>::max())
+       minBufferSizeEventSizeRatio = 1.0; // In this case, maxBufferedEvents will never be used but we want to avoid any floating point exception
 
      maxBufferedEvents = size_t(2 * minBufferSizeEventSizeRatio) // there is room for two local buffers on the server