#include "irrlichttypes.h"
#include <string>
-#include "jthread/jmutex.h"
-#include "jthread/jmutexautolock.h"
#include <map>
+
+#include "threading/mutex_auto_lock.h"
#include "util/timetaker.h"
-#include "util/numeric.h" // paging()
-#include "debug.h" // assert()
+#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
class Profiler
{
public:
- Profiler()
- {
- }
+ Profiler() {}
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 */
std::map<std::string, int>::iterator n = m_avgcounts.find(name);
void avg(const std::string &name, float value)
{
- JMutexAutoLock lock(m_mutex);
- {
- std::map<std::string, int>::iterator n = m_avgcounts.find(name);
- if(n == m_avgcounts.end())
- m_avgcounts[name] = 1;
- else{
- /* No add shall have been used */
- assert(n->second != -2);
- n->second = (std::max)(n->second, 0) + 1;
- }
- }
- {
- std::map<std::string, float>::iterator n = m_data.find(name);
- if(n == m_data.end())
- m_data[name] = value;
- else
- n->second += 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);
+ MutexAutoLock lock(m_mutex);
for(std::map<std::string, float>::iterator
i = m_data.begin();
i != m_data.end(); ++i)
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(std::map<std::string, float>::iterator
- i = m_data.begin();
- i != m_data.end(); ++i)
- {
- if(maxindex == 0)
+ for (std::map<std::string, float>::const_iterator i = m_data.begin();
+ i != m_data.end(); ++i) {
+ if (maxindex == 0)
break;
maxindex--;
- if(minindex != 0)
- {
+ if (minindex != 0) {
minindex--;
continue;
}
- std::string name = i->first;
int avgcount = 1;
- std::map<std::string, int>::iterator n = m_avgcounts.find(name);
- if(n != m_avgcounts.end()){
+ std::map<std::string, int>::const_iterator n = m_avgcounts.find(i->first);
+ if (n != m_avgcounts.end()) {
if(n->second >= 1)
avgcount = n->second;
}
- o<<" "<<name<<": ";
+ o << " " << i->first << ": ";
s32 clampsize = 40;
- s32 space = clampsize - name.size();
- for(s32 j=0; j<space; j++)
- {
- if(j%2 == 0 && j < space - 1)
- o<<"-";
+ s32 space = clampsize - i->first.size();
+ for(s32 j = 0; j < space; j++) {
+ if (j % 2 == 0 && j < space - 1)
+ o << "-";
else
- o<<" ";
+ o << " ";
}
- o<<(i->second / avgcount);
- o<<std::endl;
+ o << (i->second / avgcount);
+ o << std::endl;
}
}
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())
}
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;
+ 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;
{
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;
- case SPT_GRAPH_ADD:
- m_profiler->graphAdd(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;
};