Profiler: new scopedTiming class

stuff/profiler.hh

@@ -126,6 +126,22 @@ public:
     m_cur_run_num++;
   }
 
+  class ScopedTiming
+  {
+    const std::string section_name_;
+
+  public:
+    ScopedTiming(const std::string& section_name)
+      : section_name_(section_name)
+    {
+      Profiler::instance().StartTiming(section_name_);
+    }
+    ~ScopedTiming()
+    {
+      Profiler::instance().StopTiming(section_name_);
+    }
+  };
+
 protected:
   MapVector m_timings;
   unsigned int m_cur_run_num;
@@ -133,6 +149,12 @@ protected:
   // debug counter, only outputted in debug mode
   std::map<int, int> m_count;
   clock_t init_time_;
+
+  static Profiler& instance()
+  {
+    static Profiler pf;
+    return pf;
+  }
 };
 
 template <class CollectiveCommunication>
@@ -234,7 +256,7 @@ long Profiler::OutputCommon(CollectiveCommunication& comm, InfoContainer& run_in
       << "numDofs\t"
       << "L2 error\t";
   for (DataMap::const_iterator it = m_timings[0].begin(); it != m_timings[0].end(); ++it) {
-    csv << it->first << ",";
+    csv << it->first << "\t";
   }
   csv << "Relative total time" << std::endl;
 
@@ -267,8 +289,7 @@ long Profiler::OutputCommon(CollectiveCommunication& comm, InfoContainer& run_in
 //! global profiler object
 Profiler& profiler()
 {
-  static Profiler pf;
-  return pf;
+  return Profiler::instance();
 }
 
 #endif // PROFILER_HH_INCLUDED