Switch the license to be LGPLv2/later, with small parts still remaining as GPLv2...

[dragonfireclient.git] / src / profiler.h

diff --git a/src/profiler.h b/src/profiler.h
index 8eaf18df5effb290e88ec49d2a37758d94e82121..9264cc2ab6b6ad9721c05e4c2a5cd2da968104f3 100644 (file)
--- a/src/profiler.h
+++ b/src/profiler.h
@@ -3,16 +3,16 @@ Minetest-c55
 Copyright (C) 2011 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 General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
 (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+GNU Lesser General Public License for more details.
 
-You should have received a copy of the GNU General Public License along
+You should have received a copy of the GNU Lesser General Public License along
 with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
@@ -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
@@ -41,28 +42,48 @@ class Profiler
        void add(const std::string &name, float value)
        {
                JMutexAutoLock lock(m_mutex);
-               core::map<std::string, float>::Node *n = m_data.find(name);
-               if(n == NULL)
                {
-                       m_data[name] = value;
+                       /* 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)
+                               m_avgcounts[name] = -2;
+                       else{
+                               if(n->getValue() == -1)
+                                       n->setValue(-2);
+                               assert(n->getValue() == -2);
+                       }
                }
-               else
                {
-                       n->setValue(n->getValue() + value);
+                       core::map<std::string, float>::Node *n = m_data.find(name);
+                       if(n == NULL)
+                               m_data[name] = value;
+                       else
+                               n->setValue(n->getValue() + value);
                }
        }
 
-       void lowpass(const std::string &name, float value, float factor)
+       void avg(const std::string &name, float value)
        {
                JMutexAutoLock lock(m_mutex);
-               core::map<std::string, float>::Node *n = m_data.find(name);
-               if(n == NULL)
                {
-                       m_data[name] = value;
+                       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);
+                       }
                }
-               else
                {
-                       n->setValue(n->getValue() * (1.0 - 1.0/factor) + value / factor);
+                       core::map<std::string, float>::Node *n = m_data.find(name);
+                       if(n == NULL)
+                               m_data[name] = value;
+                       else
+                               n->setValue(n->getValue() + value);
                }
        }
 
@@ -75,16 +96,42 @@ class Profiler
                {
                        i.getNode()->setValue(0);
                }
+               m_avgcounts.clear();
        }
 
        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);
+                       if(n){
+                               if(n->getValue() >= 1)
+                                       avgcount = n->getValue();
+                       }
                        o<<"  "<<name<<": ";
                        s32 clampsize = 40;
                        s32 space = clampsize - name.size();
@@ -95,19 +142,41 @@ class Profiler
                                else
                                        o<<" ";
                        }
-                       o<<i.getNode()->getValue();
+                       o<<(i.getNode()->getValue() / avgcount);
                        o<<std::endl;
                }
        }
 
+       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_LOWPASS
+       SPT_AVG,
+       SPT_GRAPH_ADD
 };
 
 class ScopeProfiler
@@ -138,14 +207,18 @@ class ScopeProfiler
        {
                if(m_timer)
                {
-                       u32 duration = m_timer->stop(true);
+                       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_LOWPASS:
-                                       m_profiler->lowpass(m_name, duration, 20.0);
+                               case SPT_AVG:
+                                       m_profiler->avg(m_name, duration);
+                                       break;
+                               case SPT_GRAPH_ADD:
+                                       m_profiler->graphAdd(m_name, duration);
                                        break;
                                }
                        }