Changeset 2503

Timestamp:

05/12/23 15:46:18 (14 months ago)

Author:

jderouillat

Message:

Add an option called memory_report (in the xios context, default is true) to activate the memory reporting operated at each xios routine call from models

Location:

XIOS2/trunk/src

Files:

• client.cpp (modified) (1 diff)
• cxios.cpp (modified) (2 diffs)
• cxios.hpp (modified) (1 diff)
• mem_checker.cpp (modified) (1 diff)
• server.cpp (modified) (1 diff)

XIOS2/trunk/src/client.cpp

@@ -303 +303 @@
       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 ;
       report(100)<<CTimer::getAllCumulatedTime()<<endl ;
-      report(100)<<CMemChecker::getAllCumulatedMem()<<endl ;
+      if (CXios::reportMemory)
+      {
+        report(100)<<CMemChecker::getAllCumulatedMem()<<endl ;
+      }
    }
 

XIOS2/trunk/src/cxios.cpp

@@ -48 +48 @@
   bool CXios::checkSumSend=false ;
   bool CXios::logMemory=false ;
+  bool CXios::reportMemory=true ;
  
   //! Parse configuration file and create some objects from it
@@ -112 +113 @@
 
     logMemory = getin<bool>("log_memory", false);
+    reportMemory = getin<bool>("memory_report", true);
  
     globalComm=MPI_COMM_WORLD ;

XIOS2/trunk/src/cxios.hpp

@@ -60 +60 @@
      static bool checkSumRecv; //!< For debugging, compute a checksum of fields received by the model through the XIOS client
 
-     static bool logMemory; //!< Activate memory monitoring for all XIOS process
+     static bool logMemory; //!< Activate memory monitoring for all XIOS process (generate CSV file for https://forge.ipsl.jussieu.fr/ioserver/chrome/site/XIOS_TOOLS/xios_memory.html)
+     static bool reportMemory; //!< Activate memory reporting for all XIOS process (report in log files)
 
     public:

XIOS2/trunk/src/mem_checker.cpp

@@ -44 +44 @@
   {
     std::vector<double> memories(0);
+    if ( !CXios::reportMemory ) return memories ;
     memories.clear();
     

XIOS2/trunk/src/server.cpp

@@ -434 +434 @@
       report(0)<<"Performance report : Ratio : "<<CTimer::get("Process events").getCumulatedTime()/CTimer::get("XIOS server").getCumulatedTime()*100.<<"%"<<endl  ;
       report(100)<<CTimer::getAllCumulatedTime()<<endl ;
-      report(100)<<CMemChecker::getAllCumulatedMem()<<endl ;
+      if (CXios::reportMemory)
+      {
+        report(100)<<CMemChecker::getAllCumulatedMem()<<endl ;
+      }
+
     }