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 129118ef6216c567281044f1e8b8741f009f764a..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
@@ -99,12 +100,31 @@ class Profiler
        }
 
        void print(std::ostream &o)
+       {
+               printPage(o, 1, 1);
+       }
+
+       void printPage(std::ostream &o, u32 page, u32 pagecount)
        {
                JMutexAutoLock 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++)
                {
+                       if(maxindex == 0)
+                               break;
+                       maxindex--;
+
+                       if(minindex != 0)
+                       {
+                               minindex--;
+                               continue;
+                       }
+
                        std::string name = i.getNode()->getKey();
                        int avgcount = 1;
                        core::map<std::string, int>::Node *n = m_avgcounts.find(name);
@@ -127,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
@@ -176,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;