Changeset 1750 for XIOS

Timestamp:

10/18/19 14:30:54 (5 years ago)

Author:

ymipsl

Message:

Improve timer and tracing functionnalities

YM

Location:

XIOS/dev/dev_ym/XIOS_ONE_SIDED/src

Files:

• timer.cpp (modified) (4 diffs)
• timer.hpp (modified) (2 diffs)
• tracer.cpp (modified) (4 diffs)

XIOS/dev/dev_ym/XIOS_ONE_SIDED/src/timer.cpp

@@ -11 +11 @@
   std::map<std::string,CTimer> CTimer::allTimer;
   
-  CTimer::CTimer(const std::string& name_) : name(name_) 
+  CTimer::CTimer(const std::string& name_, bool trace) : name(name_) 
   { 
+    isTracing_=trace ;
     reset();
   }
@@ -25 +26 @@
     if (!suspended) 
     {
-      traceEnd(name);
+      if (isTracing_) traceEnd(name);
       cumulatedTime += getTime() - lastTime;
     }
@@ -36 +37 @@
     {
       lastTime = getTime();
-      traceBegin(name);
+      if (isTracing_) traceBegin(name);
     }
     suspended = false;
@@ -52 +53 @@
   }
   
-  CTimer& CTimer::get(const std::string name)
+  CTimer& CTimer::get(const std::string name, bool trace)
   {
     std::map<std::string,CTimer>::iterator it = allTimer.find(name);
     if (it == allTimer.end())
-      it = allTimer.insert(std::make_pair(name, CTimer(name))).first;
+      it = allTimer.insert(std::make_pair(name, CTimer(name,trace))).first;
     return it->second;
   }

XIOS/dev/dev_ym/XIOS_ONE_SIDED/src/timer.hpp

@@ -13 +13 @@
       double lastTime;
       bool suspended;
+      bool isTracing_ ;
       std::string name;
 
-      CTimer(const std::string& name);
+      CTimer(const std::string& name, bool trace=true);
       void suspend(void);
       void resume(void);
@@ -22 +23 @@
       static std::map<std::string,CTimer> allTimer;
       static double getTime(void);
-      static CTimer& get(std::string name);
+      static CTimer& get(std::string name, bool trace=true);
       static std::string getAllCumulatedTime(void) ;
   };

XIOS/dev/dev_ym/XIOS_ONE_SIDED/src/tracer.cpp

@@ -25 +25 @@
   std::map<std::string,int> regionId ;
   int count=0 ;
+  bool traceIsOn=true ;
+  int stackOnOffdeep=0 ;
   
   void traceOn(void)
   {
+    stackOnOffdeep-- ;
+    if (stackOnOffdeep!=0) return ;
+    traceIsOn=true; 
+
 #if defined(VTRACE)
     VT_ON() ;
@@ -39 +45 @@
   void traceOff(void) 
   {
+    stackOnOffdeep++ ;
+    if (stackOnOffdeep!=1) return ;
+    traceIsOn=false; 
 #if defined(VTRACE)
     VT_OFF() ;
@@ -51 +60 @@
   {
 #if defined(VTRACE)
-    VT_USER_START(name.c_str()) ;
+    
+    if (traceIsOn) VT_USER_START(name.c_str()) ;
 #elif defined(SCOREP)
     SCOREP_USER_REGION_BY_NAME_BEGIN(name.c_str(),SCOREP_USER_REGION_TYPE_COMMON)
@@ -76 +86 @@
   {
 #if defined (VTRACE)
-    VT_USER_END(name.c_str()) ;
+    if (traceIsOn) VT_USER_END(name.c_str()) ;
 #elif defined(SCOREP)
     SCOREP_USER_REGION_BY_NAME_END(name.c_str())