Changeset 917 for XIOS/trunk/src/buffer_client.cpp

Timestamp:

08/04/16 16:24:20 (8 years ago)

Author:

rlacroix

Message:

Fix the client/server communication protocol.

In the some extreme cases a deadlock could occur. To fix this, the number of buffered events must be properly limited.

If you noticed decreased performance due to this commit, please let us know about it.

Fixes ticket #91.

File:

• XIOS/trunk/src/buffer_client.cpp (modified) (4 diffs)

XIOS/trunk/src/buffer_client.cpp

@@ -12 +12 @@
   size_t CClientBuffer::maxRequestSize = 0;
 
-  CClientBuffer::CClientBuffer(MPI_Comm interComm_, int serverRank_, StdSize bfSize)
+  CClientBuffer::CClientBuffer(MPI_Comm interComm, int serverRank, StdSize bufferSize, StdSize maxBufferedEvents)
+    : interComm(interComm)
+    , serverRank(serverRank)
+    , bufferSize(bufferSize)
+    , current(0)
+    , count(0)
+    , bufferedEvents(0)
+    , maxBufferedEvents(maxBufferedEvents)
+    , pending(false)
   {
-    interComm = interComm_;
-    serverRank = serverRank_;
-    bufferSize = bfSize;
     buffer[0] = new char[bufferSize]; // transform it with MPI_ALLOC_MEM later
     buffer[1] = new char[bufferSize];
-    current = 0;
-    count = 0;
-    pending = false;
     retBuffer = new CBufferOut(buffer[current], bufferSize);
-    info(10) << "CClientBuffer: allocated " << bufferSize << " bytes for server " << serverRank_ << endl;
+    info(10) << "CClientBuffer: allocated 2 x " << bufferSize << " bytes for server " << serverRank << " with a maximum of " << maxBufferedEvents << " buffered events" << endl;
   }
 
@@ -46 +48 @@
             << "The requested size (" << size << " bytes) is too big to fit the buffer (" << bufferSize << " bytes), please increase the client buffer size." << endl);
 
-    return (size <= remain());
+    return (size <= remain() && bufferedEvents < maxBufferedEvents);
   }
 
@@ -56 +58 @@
       retBuffer->realloc(buffer[current] + count, size);
       count += size;
+      bufferedEvents++;
       return retBuffer;
     }
@@ -88 +91 @@
         else current = 1;
         count = 0;
+        bufferedEvents = 0;
       }
     }