Changeset 2418

Timestamp:

10/11/22 15:19:14 (19 months ago)

Author:

jderouillat

Message:

Integrates a system to log the memory consumption from XIOS init to XIOS finalize, and a HTML webpage to visualize it. The API to use it from models is available too.

Location:

XIOS3/trunk

Files:

• scripts (added)
• scripts/index_load.html (added)
• src/client.cpp (modified) (2 diffs)
• src/cxios.cpp (modified) (3 diffs)
• src/filter/model_to_client_source_filter.cpp (modified) (2 diffs)
• src/filter/temporal_filter.cpp (modified) (2 diffs)
• src/interface/c/icmem_checker.cpp (added)
• src/interface/fortran/imem_checker.F90 (added)
• src/interface/fortran/ixios.F90 (modified) (1 diff)
• src/mem_checker.cpp (modified) (4 diffs)
• src/mem_checker.hpp (modified) (2 diffs)
• src/node/context.cpp (modified) (4 diffs)
• src/server.cpp (modified) (4 diffs)

XIOS3/trunk/src/client.cpp

@@ -18 +18 @@
 #include "workflow_graph.hpp"
 #include "release_static_allocation.hpp"
+#include "mem_checker.hpp"
 
 namespace xios
@@ -520 +521 @@
       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 ;
       CWorkflowGraph::drawWorkFlowGraph_client();
 

XIOS3/trunk/src/cxios.cpp

@@ -151 +151 @@
       CClient::openErrorStream();
     }
+    CMemChecker::logMem("CXios::initClientSide");
   }
   CATCH
@@ -156 +157 @@
   void CXios::clientFinalize(void)
   {
+     CMemChecker::logMem("CXios::clientFinalize", true);
+
      CClient::finalize() ;
           
@@ -233 +236 @@
 #endif
     CMemChecker::get("xios").suspend() ;
-    report(0)<<CMemChecker::getAllCumulatedMem() ;
     CServer::closeInfoStream();
   }

XIOS3/trunk/src/filter/model_to_client_source_filter.cpp

@@ -5 +5 @@
 #include <limits> 
 #include "workflow_graph.hpp"
+#include "mem_checker.hpp"
 
 namespace xios
@@ -37 +38 @@
     packet->data.resize(connector->getDstSize()) ;
     connector->transfer(data, packet->data, nanValue) ;
+
+    CMemChecker::logMem( "CModelToClientSourceFilter::streamData" );
 
     if (hasMissingValue_)

XIOS3/trunk/src/filter/temporal_filter.cpp

@@ -3 +3 @@
 #include "calendar_util.hpp"
 #include "workflow_graph.hpp"
+#include "mem_checker.hpp"
 
 namespace xios
@@ -117 +118 @@
           packet = data[0];
 
+        CMemChecker::logMem( "CTemporalFilter::apply" );
+
         isFirstOperation = false;
         graphCycleCompleted = true;

XIOS3/trunk/src/interface/fortran/ixios.F90

@@ -38 +38 @@
                   ASSIGNMENT(=)
 USE itimer, ONLY : xios(timer_resume), xios(timer_suspend), xios(timer_reset), xios(timer_get_time)
+USE imem_checker, ONLY : xios(mem_checker_get), xios(mem_checker_log)
 
 USE ifield, ONLY : txios(field), txios(fieldgroup), xios(is_valid_field), xios(is_valid_fieldgroup)

XIOS3/trunk/src/mem_checker.cpp

@@ -7 +7 @@
 #include <fstream>
 
+#include <fcntl.h>
+#include <iomanip>
+#include <unistd.h>
+#include <cstring>
+
 namespace xios
 {
@@ -13 +18 @@
   bool CMemChecker::enabled_=true;
   bool CMemChecker::first_=true;
+  double CMemChecker::vsize_init_=0;
+  double CMemChecker::time_init_=0;
 
   CMemChecker::CMemChecker(const std::string& name) : name_(name) 
@@ -37 +44 @@
     return vsize ;
   }
+  double CMemChecker::getMemRSS(void)
+  {
+    //sleep( 1 ) ;
+    if (first_) check() ;
+    if (!enabled_) return 0;
+    std::ifstream statStream("/proc/self/stat",std::ios_base::in);
+    std::string dummy ;
+    for(int i=1;i<=23;i++) statStream>>dummy ;
+    double vsize; 
+    statStream>>vsize ;
+    if (vsize_init_==0) {
+      vsize_init_ = vsize;
+      time_init_=MPI_Wtime();
+    }
+    vsize -= vsize_init_;
+    vsize *= 4096; //getconf("PAGE_SIZE");
+    return vsize ;
+  }
+  void CMemChecker::logMem( std::string id, bool finalizeLog )
+  {
+    // function get_xios_mem_data() {
+    //   return [
+    //        ...
+    //        [ "2000-01-01 01:00:10.XXX", "XIOS close context def", 1000],
+    //        [ "2000-01-01 01:00:11.XXX", "update timestep"       , 1000],
+    //        [ "2000-01-01 01:00:15.XXX", "send field"            , 2000],
+    //        ...
+    //   ];
+    // }
+    
+    std::ofstream fout;
+    int rk = 0;
+    MPI_Comm_rank( MPI_COMM_WORLD, &rk );
+    std::string logName("mem_"+std::to_string(rk)+".js");
+    double mem = getMemRSS();
+    if (!mem) {
+      fout.open( logName );
+      fout << "function get_xios_mem_data() {" << std::endl;
+      fout << "  return [" << std::endl;
+    }
+    else
+    {
+      fout.open( logName, std::ios_base::app );
+    }
+
+    // Time format : YYYY-MM-DD HH:MM:SS.XXX -> seconds * 1000.
+    fout << "        [ " << (MPI_Wtime()-time_init_)*1000. << ", \"" << id << "\"," << mem/1000000. << "]," << std::endl;
+
+    if (finalizeLog)
+    {
+      fout << "  ];" << std::endl;
+      fout << "}" << std::endl;
+    }
+    fout.close();
+  }
+
   
   void CMemChecker::suspend(void)
@@ -53 +116 @@
     suspended_ = false;
   }
+
+  void CMemChecker::suspendRSS(void)
+  {
+    if (first_) check() ;
+    if (!enabled_) return ;
+    if (!suspended_) cumulatedMem_ += getMemRSS() - lastMem_;
+    suspended_ = true;
+  }
   
+  void CMemChecker::resumeRSS(void)
+  {
+    if (first_) check() ;
+    if (!enabled_) return ;
+    if (suspended_) lastMem_ = getMemRSS();
+    suspended_ = false;
+  }
+  
+
   void CMemChecker::reset(void)
   {

XIOS3/trunk/src/mem_checker.hpp

@@ -13 +13 @@
       void suspend(void);
       void resume(void);
+      void suspendRSS(void);
+      void resumeRSS(void);
       void reset(void);
       double getCumulatedMem(void);
       static double getMem(void);
+      static double getMemRSS(void);
+      static void logMem( std::string id, bool finalizeLog = false );
       static CMemChecker& get(std::string name);
       static std::string getAllCumulatedMem(void) ;
@@ -32 +36 @@
       static bool first_ ;
       static bool enabled_ ;
+
+      static double vsize_init_;
+      static double time_init_;
   };
 }

XIOS3/trunk/src/node/context.cpp

@@ -17 +17 @@
 #include "xios_spl.hpp"
 #include "timer.hpp"
+#include "mem_checker.hpp"
 #include "memtrack.hpp"
 #include <limits>
@@ -888 +889 @@
    TRY
    {
+     CMemChecker::logMem( "CContext::closeDefinition" );
+
      CTimer::get("Context : close definition").resume() ;
      
@@ -1159 +1162 @@
     for(auto& it : fieldBufferEvaluation) it.first->setBufferSize(it.second) ;
 
-
      CTimer::get("Context : close definition").suspend() ;
+     CMemChecker::logMem( "CContext::closeDefinition END" );
   }
   CATCH_DUMP_ATTR
@@ -2022 +2025 @@
       if (prevStep < step)
       {
+        CMemChecker::logMem( "CContext::updateCalendar_"+std::to_string(step) );
         if (serviceType_==CServicesManager::CLIENT) // For now we only use server level 1 to read data
         {

XIOS3/trunk/src/server.cpp

@@ -13 +13 @@
 #include "tracer.hpp"
 #include "timer.hpp"
+#include "mem_checker.hpp"
 #include "event_scheduler.hpp"
 #include "string_tools.hpp"
@@ -159 +160 @@
       CServer::openInfoStream(CXios::serverFile);
       CServer::openErrorStream(CXios::serverFile);
+
+      CMemChecker::logMem( "CServer::initialize" );
 
       /////////////////////////////////////////
@@ -431 +434 @@
       CXios::getMpiGarbageCollector().release() ; // release unfree MPI ressources
 
+      CMemChecker::logMem( "CServer::finalize", true );
       if (!is_MPI_Initialized)
       {
@@ -440 +444 @@
       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 ;
       
       CWorkflowGraph::drawWorkFlowGraph_server();