X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fprofiler.h;h=e8eac86b13e5b8c0ddf130b11fb3d99233331f2e;hb=c92cff5d52efa0f811b605efd8d77ff23e44b226;hp=b1e6abe5883312a1ceac1e06db2970b1876eb893;hpb=9f031a67594162a53b07acbfbc65faf8c4938e99;p=dragonfireclient.git

diff --git a/src/profiler.h b/src/profiler.h
index b1e6abe58..e8eac86b1 100644
--- a/src/profiler.h
+++ b/src/profiler.h
@@ -1,6 +1,6 @@
 /*
-Minetest-c55
-Copyright (C) 2011 celeron55, Perttu Ahola <celeron55@gmail.com>
+Minetest
+Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU Lesser General Public License as published by
@@ -20,13 +20,21 @@ 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 "threading/mutex.h"
+#include "threading/mutex_auto_lock.h"
 #include "util/timetaker.h"
-#include "util/numeric.h" // paging()
+#include "util/numeric.h"      // paging()
+#include "debug.h"             // assert()
+
+#define MAX_PROFILER_TEXT_ROWS 20
+
+// Global profiler
+class Profiler;
+extern Profiler *g_profiler;
 
 /*
 	Time profiler
@@ -37,65 +45,49 @@ class Profiler
 public:
 	Profiler()
 	{
-		m_mutex.Init();
 	}
 
 	void add(const std::string &name, float value)
 	{
-		JMutexAutoLock lock(m_mutex);
+		MutexAutoLock lock(m_mutex);
 		{
 			/* No average shall have been used; mark add used as -2 */
-			core::map<std::string, int>::Node *n = m_avgcounts.find(name);
-			if(n == NULL)
+			std::map<std::string, int>::iterator n = m_avgcounts.find(name);
+			if(n == m_avgcounts.end())
 				m_avgcounts[name] = -2;
 			else{
-				if(n->getValue() == -1)
-					n->setValue(-2);
-				assert(n->getValue() == -2);
+				if(n->second == -1)
+					n->second = -2;
+				assert(n->second == -2);
 			}
 		}
 		{
-			core::map<std::string, float>::Node *n = m_data.find(name);
-			if(n == NULL)
+			std::map<std::string, float>::iterator n = m_data.find(name);
+			if(n == m_data.end())
 				m_data[name] = value;
 			else
-				n->setValue(n->getValue() + value);
+				n->second += value;
 		}
 	}
 
 	void avg(const std::string &name, float value)
 	{
-		JMutexAutoLock lock(m_mutex);
-		{
-			core::map<std::string, int>::Node *n = m_avgcounts.find(name);
-			if(n == NULL)
-				m_avgcounts[name] = 1;
-			else{
-				/* No add shall have been used */
-				assert(n->getValue() != -2);
-				if(n->getValue() <= 0)
-					n->setValue(1);
-				else
-					n->setValue(n->getValue() + 1);
-			}
-		}
-		{
-			core::map<std::string, float>::Node *n = m_data.find(name);
-			if(n == NULL)
-				m_data[name] = value;
-			else
-				n->setValue(n->getValue() + value);
-		}
+		MutexAutoLock lock(m_mutex);
+		int &count = m_avgcounts[name];
+
+		assert(count != -2);
+		count = MYMAX(count, 0) + 1;
+		m_data[name] += value;
 	}
 
 	void clear()
 	{
-		JMutexAutoLock lock(m_mutex);
-		for(core::map<std::string, float>::Iterator
-				i = m_data.getIterator();
-				i.atEnd() == false; i++)
+		MutexAutoLock lock(m_mutex);
+		for(std::map<std::string, float>::iterator
+				i = m_data.begin();
+				i != m_data.end(); ++i)
 		{
-			i.getNode()->setValue(0);
+			i->second = 0;
 		}
 		m_avgcounts.clear();
 	}
@@ -105,16 +97,31 @@ class Profiler
 		printPage(o, 1, 1);
 	}
 
+	float getValue(const std::string &name) const
+	{
+		std::map<std::string, float>::const_iterator numerator = m_data.find(name);
+		if (numerator == m_data.end())
+			return 0.f;
+
+		std::map<std::string, int>::const_iterator denominator = m_avgcounts.find(name);
+		if (denominator != m_avgcounts.end()){
+			if (denominator->second >= 1)
+				return numerator->second / denominator->second;
+		}
+
+		return numerator->second;
+	}
+
 	void printPage(std::ostream &o, u32 page, u32 pagecount)
 	{
-		JMutexAutoLock lock(m_mutex);
+		MutexAutoLock lock(m_mutex);
 
 		u32 minindex, maxindex;
 		paging(m_data.size(), page, pagecount, minindex, maxindex);
 
-		for(core::map<std::string, float>::Iterator
-				i = m_data.getIterator();
-				i.atEnd() == false; i++)
+		for(std::map<std::string, float>::iterator
+				i = m_data.begin();
+				i != m_data.end(); ++i)
 		{
 			if(maxindex == 0)
 				break;
@@ -126,12 +133,12 @@ class Profiler
 				continue;
 			}
 
-			std::string name = i.getNode()->getKey();
+			std::string name = i->first;
 			int avgcount = 1;
-			core::map<std::string, int>::Node *n = m_avgcounts.find(name);
-			if(n){
-				if(n->getValue() >= 1)
-					avgcount = n->getValue();
+			std::map<std::string, int>::iterator n = m_avgcounts.find(name);
+			if(n != m_avgcounts.end()){
+				if(n->second >= 1)
+					avgcount = n->second;
 			}
 			o<<"  "<<name<<": ";
 			s32 clampsize = 40;
@@ -143,7 +150,7 @@ class Profiler
 				else
 					o<<" ";
 			}
-			o<<(i.getNode()->getValue() / avgcount);
+			o<<(i->second / avgcount);
 			o<<std::endl;
 		}
 	}
@@ -152,7 +159,7 @@ class Profiler
 
 	void graphAdd(const std::string &id, float value)
 	{
-		JMutexAutoLock lock(m_mutex);
+		MutexAutoLock lock(m_mutex);
 		std::map<std::string, float>::iterator i =
 				m_graphvalues.find(id);
 		if(i == m_graphvalues.end())
@@ -162,15 +169,22 @@ class Profiler
 	}
 	void graphGet(GraphValues &result)
 	{
-		JMutexAutoLock lock(m_mutex);
+		MutexAutoLock lock(m_mutex);
 		result = m_graphvalues;
 		m_graphvalues.clear();
 	}
 
+	void remove(const std::string& name)
+	{
+		MutexAutoLock lock(m_mutex);
+		m_avgcounts.erase(name);
+		m_data.erase(name);
+	}
+
 private:
-	JMutex m_mutex;
-	core::map<std::string, float> m_data;
-	core::map<std::string, int> m_avgcounts;
+	Mutex m_mutex;
+	std::map<std::string, float> m_data;
+	std::map<std::string, int> m_avgcounts;
 	std::map<std::string, float> m_graphvalues;
 };