Changeset 1192

Timestamp:

07/03/17 14:34:22 (7 years ago)

Author:

rlacroix

Message:

Display a warning message if an event has a size greater than the estimated maximum event size.

This should not happen in theory and must be fixed.

Location:

XIOS/trunk/src

Files:

• buffer_client.cpp (modified) (2 diffs)
• buffer_client.hpp (modified) (2 diffs)
• context_client.cpp (modified) (2 diffs)
• context_client.hpp (modified) (1 diff)

XIOS/trunk/src/buffer_client.cpp

@@ -12 +12 @@
   size_t CClientBuffer::maxRequestSize = 0;
 
-  CClientBuffer::CClientBuffer(MPI_Comm interComm, int serverRank, StdSize bufferSize, StdSize maxBufferedEvents)
+  CClientBuffer::CClientBuffer(MPI_Comm interComm, int serverRank, StdSize bufferSize, StdSize estimatedMaxEventSize, StdSize maxBufferedEvents)
     : interComm(interComm)
     , serverRank(serverRank)
     , bufferSize(bufferSize)
+    , estimatedMaxEventSize(estimatedMaxEventSize)
+    , maxEventSize(0)
     , current(0)
     , count(0)
@@ -42 +44 @@
   bool CClientBuffer::isBufferFree(int size)
   {
-    if (size > maxRequestSize) maxRequestSize = size;
-
     if (size > bufferSize)
       ERROR("bool CClientBuffer::isBufferFree(int size)",
             << "The requested size (" << size << " bytes) is too big to fit the buffer (" << bufferSize << " bytes), please increase the client buffer size." << endl);
+
+    if (size > maxEventSize)
+    {
+      maxEventSize = size;
+
+      if (size > estimatedMaxEventSize)
+        error(0) << "WARNING: Unexpected event of size " << size << " for server " << serverRank
+                 << " (estimated max event size = " << estimatedMaxEventSize << ")" << std::endl;
+
+      if (size > maxRequestSize) maxRequestSize = size;
+    }
+
 
     return (size <= remain() && bufferedEvents < maxBufferedEvents);

XIOS/trunk/src/buffer_client.hpp

@@ -14 +14 @@
       static size_t maxRequestSize;
 
-      CClientBuffer(MPI_Comm intercomm, int serverRank, StdSize bufferSize, StdSize maxBufferedEvents);
+      CClientBuffer(MPI_Comm intercomm, int serverRank, StdSize bufferSize, StdSize estimatedMaxEventSize, StdSize maxBufferedEvents);
       ~CClientBuffer();
 
@@ -29 +29 @@
       int count;
       int bufferedEvents;
+      int maxEventSize;
       const int maxBufferedEvents;
       const int bufferSize;
+      const int estimatedMaxEventSize;
       const int serverRank;
       bool pending;

XIOS/trunk/src/context_client.cpp

@@ -234 +234 @@
         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);
+        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));
@@ -283 +284 @@
    {
      mapBufferSize_ = mapSize;
+     maxEventSizes = maxEventSize;
 
      // Compute the maximum number of events that can be safely buffered.

XIOS/trunk/src/context_client.hpp

@@ -76 +76 @@
       //! Mapping of server and buffer size for each connection to server
       std::map<int,StdSize> mapBufferSize_;
+      //! Maximum event sizes estimated for each connection to server
+      std::map<int,StdSize> maxEventSizes;
       //! Maximum number of events that can be buffered
       StdSize maxBufferedEvents;