/*
-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 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.
*/
-#ifndef PROFILER_HEADER
-#define PROFILER_HEADER
+#pragma once
-#include "common_irrlicht.h"
+#include "irrlichttypes.h"
+#include <cassert>
#include <string>
-#include "utility.h"
-#include <jmutex.h>
-#include <jmutexautolock.h>
+#include <map>
+#include <ostream>
+
+#include "threading/mutex_auto_lock.h"
+#include "util/timetaker.h"
+#include "util/numeric.h" // paging()
+
+// Global profiler
+class Profiler;
+extern Profiler *g_profiler;
/*
Time profiler
class Profiler
{
public:
- Profiler()
- {
- m_mutex.Init();
- }
+ Profiler();
- void add(const std::string &name, float value)
- {
- JMutexAutoLock 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)
- m_avgcounts[name] = -2;
- else{
- if(n->getValue() == -1)
- n->setValue(-2);
- assert(n->getValue() == -2);
- }
- }
- {
- 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 add(const std::string &name, float value);
+ void avg(const std::string &name, float value);
+ void clear();
- 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);
- }
- }
+ float getValue(const std::string &name) const;
+ int getAvgCount(const std::string &name) const;
+ u64 getElapsedMs() const;
+
+ typedef std::map<std::string, float> GraphValues;
+
+ // Returns the line count
+ int print(std::ostream &o, u32 page = 1, u32 pagecount = 1);
+ void getPage(GraphValues &o, u32 page, u32 pagecount);
- void clear()
+
+ void graphAdd(const std::string &id, float value)
{
- JMutexAutoLock lock(m_mutex);
- for(core::map<std::string, float>::Iterator
- i = m_data.getIterator();
- i.atEnd() == false; i++)
- {
- i.getNode()->setValue(0);
- }
- m_avgcounts.clear();
+ MutexAutoLock 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 print(std::ostream &o)
+ void graphGet(GraphValues &result)
{
- printPage(o, 1, 1);
+ MutexAutoLock lock(m_mutex);
+ result = m_graphvalues;
+ m_graphvalues.clear();
}
- void printPage(std::ostream &o, u32 page, u32 pagecount)
+ void remove(const std::string& name)
{
- 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();
- for(s32 j=0; j<space; j++)
- {
- if(j%2 == 0 && j < space - 1)
- o<<"-";
- else
- o<<" ";
- }
- o<<(i.getNode()->getValue() / avgcount);
- o<<std::endl;
- }
+ 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;
+ std::mutex m_mutex;
+ std::map<std::string, float> m_data;
+ std::map<std::string, int> m_avgcounts;
+ std::map<std::string, float> m_graphvalues;
+ u64 m_start_time;
};
enum ScopeProfilerType{
SPT_ADD,
- SPT_AVG
+ SPT_AVG,
+ SPT_GRAPH_ADD
};
class ScopeProfiler
{
public:
ScopeProfiler(Profiler *profiler, const std::string &name,
- enum ScopeProfilerType type = SPT_ADD):
- m_profiler(profiler),
- m_name(name),
- m_timer(NULL),
- m_type(type)
- {
- if(m_profiler)
- m_timer = new TimeTaker(m_name.c_str());
- }
- // name is copied
- ScopeProfiler(Profiler *profiler, const char *name,
- enum ScopeProfilerType type = SPT_ADD):
- m_profiler(profiler),
- m_name(name),
- m_timer(NULL),
- m_type(type)
- {
- if(m_profiler)
- m_timer = new TimeTaker(m_name.c_str());
- }
- ~ScopeProfiler()
- {
- if(m_timer)
- {
- 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_AVG:
- m_profiler->avg(m_name, duration);
- break;
- }
- }
- delete m_timer;
- }
- }
+ ScopeProfilerType type = SPT_ADD);
+ ~ScopeProfiler();
private:
- Profiler *m_profiler;
+ Profiler *m_profiler = nullptr;
std::string m_name;
- TimeTaker *m_timer;
+ TimeTaker *m_timer = nullptr;
enum ScopeProfilerType m_type;
};
-
-#endif
-
projects / dragonfireclient.git / blobdiff