Changeset 717

Timestamp:

10/05/15 15:32:51 (8 years ago)

Author:

rlacroix

Message:

Fix: The "buffer_factor_size" was applied twice to the server buffers.

Also reduce the visibility of the member variables of CServerBuffer.

Location:

XIOS/trunk/src

Files:

• buffer_server.cpp (modified) (1 diff)
• buffer_server.hpp (modified) (1 diff)

XIOS/trunk/src/buffer_server.cpp

@@ -9 +9 @@
   CServerBuffer::CServerBuffer(StdSize buffSize)
   {
-    bufferSizeByClient= buffSize * 2 * CXios::bufferServerFactorSize; //::bufferSize*CXios::bufferServerFactorSize ;
-    size=bufferSizeByClient ;
-    first=0 ;
-    current=1 ;
-    end=size ;
-    buffer=new char[size] ;  // change later for MPI_ALLOC_MEM later
+    size = 2 * buffSize;
+    first = 0;
+    current = 1;
+    end = size;
+    buffer = new char[size]; // use MPI_ALLOC_MEM later?
   }
 

XIOS/trunk/src/buffer_server.hpp

@@ -9 +9 @@
 namespace xios
 {
-
   class CServerBuffer
   {
+    public:
+      CServerBuffer(StdSize bufSize) ;
+      ~CServerBuffer() ;
 
-    public:
+      bool isBufferFree(size_t count) ;
+      void* getBuffer(size_t count) ;
+      void freeBuffer(size_t count) ;
 
-    CServerBuffer(StdSize bufSize) ;
-    ~CServerBuffer() ;
-    char* buffer ;
-
-    bool isBufferFree(size_t count) ;
-    void* getBuffer(size_t count) ;
-    void freeBuffer(size_t count) ;
-
-    size_t first ;   // first occupied element
-    size_t current ; // first free element
-    size_t end ;
-    size_t size ;
-    size_t bufferSizeByClient ;
-  } ;
-
-
+    private:
+      char* buffer;
+      size_t first;   // first occupied element
+      size_t current; // first free element
+      size_t end;
+      size_t size;
+  };
 }