X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fprofiler.h;h=25d89c6c8a6304fd77988ab50fc01189c0f5c5b3;hb=8852333eb3042580592ade478e5def20f8ed5d4c;hp=271ad70c1f1947c0b03dfd575b7ce656a1cb592f;hpb=ca7043e52d6a5d0ee1b91f287371fbe7f216697e;p=oweals%2Fminetest.git

diff --git a/src/profiler.h b/src/profiler.h
index 271ad70c1..25d89c6c8 100644
--- a/src/profiler.h
+++ b/src/profiler.h
@@ -20,13 +20,15 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef PROFILER_HEADER
 #define PROFILER_HEADER
 
-#include "irrlichttypes_bloated.h"
+#include "irrlichttypes.h"
 #include <string>
-#include <jmutex.h>
-#include <jmutexautolock.h>
 #include <map>
+
+#include "jthread/jmutex.h"
+#include "jthread/jmutexautolock.h"
 #include "util/timetaker.h"
 #include "util/numeric.h" // paging()
+#include "debug.h" // assert()
 
 /*
 	Time profiler
@@ -37,7 +39,6 @@ class Profiler
 public:
 	Profiler()
 	{
-		m_mutex.Init();
 	}
 
 	void add(const std::string &name, float value)
@@ -73,7 +74,7 @@ public:
 			else{
 				/* No add shall have been used */
 				assert(n->second != -2);
-				n->second = (std::max)(n->second, 0) + 1;
+				n->second = MYMAX(n->second, 0) + 1;
 			}
 		}
 		{
@@ -164,6 +165,13 @@ public:
 		m_graphvalues.clear();
 	}
 
+	void remove(const std::string& name)
+	{
+		JMutexAutoLock lock(m_mutex);
+		m_avgcounts.erase(name);
+		m_data.erase(name);
+	}
+
 private:
 	JMutex m_mutex;
 	std::map<std::string, float> m_data;