Noise: Prevent unittest crash caused by division by zero

[oweals/minetest.git] / src / profiler.h

diff --git a/src/profiler.h b/src/profiler.h
index 6da11597262b384d54483a31918e744db7264117..cade887e8465a94e3ef85d09fd90c1573431e8a4 100644 (file)
--- a/src/profiler.h
+++ b/src/profiler.h
@@ -24,7 +24,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include <string>
 #include <map>
 
-#include "threading/mutex.h"
 #include "threading/mutex_auto_lock.h"
 #include "util/timetaker.h"
 #include "util/numeric.h"      // paging()
@@ -43,9 +42,7 @@ extern Profiler *g_profiler;
 class Profiler
 {
 public:
-       Profiler()
-       {
-       }
+       Profiler() {}
 
        void add(const std::string &name, float value)
        {
@@ -177,7 +174,7 @@ public:
        }
 
 private:
-       Mutex m_mutex;
+       std::mutex m_mutex;
        std::map<std::string, float> m_data;
        std::map<std::string, int> m_avgcounts;
        std::map<std::string, float> m_graphvalues;
@@ -193,52 +190,12 @@ class ScopeProfiler
 {
 public:
        ScopeProfiler(Profiler *profiler, const std::string &name,
-                       enum ScopeProfilerType type = SPT_ADD):
-               m_profiler(profiler),
-               m_name(name),
-               m_timer(NULL),
-               m_type(type)
-       {
-               if(m_profiler)
-                       m_timer = new TimeTaker(m_name.c_str());
-       }
-       // name is copied
-       ScopeProfiler(Profiler *profiler, const char *name,
-                       enum ScopeProfilerType type = SPT_ADD):
-               m_profiler(profiler),
-               m_name(name),
-               m_timer(NULL),
-               m_type(type)
-       {
-               if(m_profiler)
-                       m_timer = new TimeTaker(m_name.c_str());
-       }
-       ~ScopeProfiler()
-       {
-               if(m_timer)
-               {
-                       float duration_ms = m_timer->stop(true);
-                       float duration = duration_ms / 1000.0;
-                       if(m_profiler){
-                               switch(m_type){
-                               case SPT_ADD:
-                                       m_profiler->add(m_name, duration);
-                                       break;
-                               case SPT_AVG:
-                                       m_profiler->avg(m_name, duration);
-                                       break;
-                               case SPT_GRAPH_ADD:
-                                       m_profiler->graphAdd(m_name, duration);
-                                       break;
-                               }
-                       }
-                       delete m_timer;
-               }
-       }
+                       ScopeProfilerType type = SPT_ADD);
+       ~ScopeProfiler();
 private:
-       Profiler *m_profiler;
+       Profiler *m_profiler = nullptr;
        std::string m_name;
-       TimeTaker *m_timer;
+       TimeTaker *m_timer = nullptr;
        enum ScopeProfilerType m_type;
 };