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

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.hpp (modified) (3 diffs)

XIOS/trunk/src/buffer_client.hpp

@@ -14 +14 @@
       static size_t maxRequestSize;
 
-      CClientBuffer(MPI_Comm intercomm,int serverRank, StdSize bfSize = 0);
+      CClientBuffer(MPI_Comm intercomm, int serverRank, StdSize bufferSize, StdSize maxBufferedEvents);
       ~CClientBuffer();
 
@@ -28 +28 @@
       int current;
       int count;
-      int bufferSize;
-      int serverRank;
+      int bufferedEvents;
+      const int maxBufferedEvents;
+      const int bufferSize;
+      const int serverRank;
       bool pending;
 
@@ -35 +37 @@
 
       CBufferOut* retBuffer;
-      MPI_Comm interComm;
+      const MPI_Comm interComm;
   };
 }
-
 #endif