Changeset 1601 for XIOS/dev/dev_trunk_omp/src/timer.cpp

Timestamp:

11/19/18 15:52:54 (5 years ago)

Author:

yushan

Message:

branch_openmp merged with trunk r1597

File:

• XIOS/dev/dev_trunk_omp/src/timer.cpp (modified) (3 diffs)

XIOS/dev/dev_trunk_omp/src/timer.cpp

@@ -6 +6 @@
 #include <sstream>
 #include "tracer.hpp"
+using namespace ep_lib;
 
 namespace xios
 {
-  std::map<std::string,CTimer> CTimer::allTimer;
+  std::map<std::string,CTimer> *CTimer::allTimer_ptr = 0;
   
   CTimer::CTimer(const std::string& name_) : name(name_) 
@@ -54 +55 @@
   CTimer& CTimer::get(const std::string name)
   {
-    std::map<std::string,CTimer>::iterator it = allTimer.find(name);
-    if (it == allTimer.end())
-      it = allTimer.insert(std::make_pair(name, CTimer(name))).first;
+    if(allTimer_ptr == NULL) allTimer_ptr = new std::map<std::string,CTimer>;
+
+    std::map<std::string,CTimer>::iterator it = allTimer_ptr->find(name);
+
+    if (it == allTimer_ptr->end())
+      it = allTimer_ptr->insert(std::make_pair(name, CTimer(name))).first;
+
     return it->second;
   }
@@ -63 +68 @@
   {
     std::ostringstream strOut ;
-    for(std::map<std::string,CTimer>::iterator it=allTimer.begin();it!=allTimer.end();++it)
+    if(allTimer_ptr == 0) allTimer_ptr = new std::map<std::string,CTimer>;
+
+    for(std::map<std::string,CTimer>::iterator it=allTimer_ptr->begin();it!=allTimer_ptr->end();++it)
       strOut<<"Timer : "<<it->first<<"    -->   cumulated time : "<<it->second.getCumulatedTime()<<std::endl ;
     return strOut.str() ;