Changeset 400

Timestamp:

12/13/12 17:07:45 (11 years ago)

Author:

ymipsl

Message:

implement some memory information

• buffer memory size managment
• out of memory managment

YM

Location:

XIOS/trunk/src

Files:

• buffer_client.cpp (modified) (2 diffs)
• buffer_client.hpp (modified) (1 diff)
• client.cpp (modified) (2 diffs)
• cxios.cpp (modified) (2 diffs)
• memory.cpp (added)
• memory.hpp (added)

XIOS/trunk/src/buffer_client.cpp

@@ -11 +11 @@
 {
  
+  size_t maxRequestSize=0 ;
+  
   CClientBuffer::CClientBuffer(MPI_Comm interComm_,int serverRank_)
   {
@@ -40 +42 @@
   bool CClientBuffer::isBufferFree(int size)
   {
+    if (size>maxRequestSize) maxRequestSize=size ;
+    
     if (size>bufferSize) ERROR("CClientBuffer::hasSpace(int size)",
-                               <<"request size is too big for buffer, increase buffer client size");
+                               <<"request size is too big for buffer, increase buffer client size"<<endl
+                               <<"Current buffer_size : "<<CXios::bufferSize<<endl
+                               <<"buffer_size must be > "<<size*2<<endl)
  
     if (size<=remain()) return true ;

XIOS/trunk/src/buffer_client.hpp

@@ -8 +8 @@
 namespace xios
 {
+  extern size_t maxRequestSize ;
+  
   class CClientBuffer
   {

XIOS/trunk/src/client.cpp

@@ -9 +9 @@
 #include "mpi.hpp"
 #include "timer.hpp"
+#include "buffer_client.hpp"
 
 namespace xios
@@ -204 +205 @@
       report(0)<< " Performance report : Ratio : "<< CTimer::get("Blocking time").getCumulatedTime()/CTimer::get("XIOS").getCumulatedTime()*100.<<" %"<<endl ;
       report(0)<< " Performance report : This ratio must be close to zero. Otherwise it may be usefull to increase buffer size or numbers of server"<<endl ;
-    }
+      report(0)<< " Memory report : Current buffer_size : "<<CXios::bufferSize<<endl ;
+      report(0)<< " Memory report : Minimum buffer size required : "<<maxRequestSize*2<<endl ;
+      report(0)<< " Memory report : increasing it by a factor will increase performance, depending of the volume of data wrote in file at each time step of the file"<<endl ;
+   }
 }

XIOS/trunk/src/cxios.cpp

@@ -7 +7 @@
 #include <boost/functional/hash.hpp>
 #include "mpi.hpp"
+#include "memory.hpp"
+#include <new>
 
 namespace xios
@@ -25 +27 @@
   void CXios::initialize()
   {
+    set_new_handler(noMemory);
     parseFile(rootFile);
     usingServer=getin<bool>("using_server",false) ;