Raise PROTOCOL_VERSION to 9, as this is not compatible with earlier versions

[minetest.git] / src / profiler.h

diff --git a/src/profiler.h b/src/profiler.h
index 7bb3b37508aa2b022762601ae7fc20a2f1ddd63a..f887584d19f170b15c4c1bfc559e1ed737fd45e4 100644 (file)
--- a/src/profiler.h
+++ b/src/profiler.h
@@ -25,6 +25,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "utility.h"
 #include <jmutex.h>
 #include <jmutexautolock.h>
+#include <map>
 
 /*
        Time profiler
@@ -146,15 +147,36 @@ class Profiler
                }
        }
 
+       typedef std::map<std::string, float> GraphValues;
+
+       void graphAdd(const std::string &id, float value)
+       {
+               JMutexAutoLock lock(m_mutex);
+               std::map<std::string, float>::iterator i =
+                               m_graphvalues.find(id);
+               if(i == m_graphvalues.end())
+                       m_graphvalues[id] = value;
+               else
+                       i->second += value;
+       }
+       void graphGet(GraphValues &result)
+       {
+               JMutexAutoLock lock(m_mutex);
+               result = m_graphvalues;
+               m_graphvalues.clear();
+       }
+
 private:
        JMutex m_mutex;
        core::map<std::string, float> m_data;
        core::map<std::string, int> m_avgcounts;
+       std::map<std::string, float> m_graphvalues;
 };
 
 enum ScopeProfilerType{
        SPT_ADD,
-       SPT_AVG
+       SPT_AVG,
+       SPT_GRAPH_ADD
 };
 
 class ScopeProfiler
@@ -195,6 +217,9 @@ class ScopeProfiler
                                case SPT_AVG:
                                        m_profiler->avg(m_name, duration);
                                        break;
+                               case SPT_GRAPH_ADD:
+                                       m_profiler->graphAdd(m_name, duration);
+                                       break;
                                }
                        }
                        delete m_timer;