Wuzzy
/
BlockColor-Engine
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Optimize Profiler::avg()

This commit is contained in:
gregorycu 2015-01-22 00:25:06 +11:00 committed by ShadowNinja
parent d75a0a7394
commit 267c9f4cb4
2 changed files with 56 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/profiler.h
View File

@ -69,23 +69,11 @@ public:
void avg(const std::string &name, float value) void avg(const std::string &name, float value)
{ {
JMutexAutoLock lock(m_mutex); JMutexAutoLock lock(m_mutex);
{ int &count = m_avgcounts[name];
std::map<std::string, int>::iterator n = m_avgcounts.find(name);
if(n == m_avgcounts.end()) assert(count != -2);
m_avgcounts[name] = 1; count = MYMAX(count, 0) + 1;
else{ m_data[name] += value;
/* No add shall have been used */
assert(n->second != -2);
n->second = MYMAX(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;
}
} }
void clear() void clear()
@ -105,6 +93,21 @@ public:
printPage(o, 1, 1); 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) void printPage(std::ostream &o, u32 page, u32 pagecount)
{ {
JMutexAutoLock lock(m_mutex); JMutexAutoLock lock(m_mutex);

36
src/test.cpp
View File

@ -43,6 +43,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "util/serialize.h" #include "util/serialize.h"
#include "noise.h" // PseudoRandom used for random data for compression #include "noise.h" // PseudoRandom used for random data for compression
#include "network/networkprotocol.h" // LATEST_PROTOCOL_VERSION #include "network/networkprotocol.h" // LATEST_PROTOCOL_VERSION
#include "profiler.h"
#include <algorithm> #include <algorithm>
/* /*
@ -2118,6 +2119,40 @@ struct TestConnection: public TestBase
} }
}; };
struct TestProfiler : public TestBase
{
void Run()
{
Profiler p;
p.avg("Test1", 1.f);
UASSERT(p.getValue("Test1") == 1.f);
p.avg("Test1", 2.f);
UASSERT(p.getValue("Test1") == 1.5f);
p.avg("Test1", 3.f);
UASSERT(p.getValue("Test1") == 2.f);
p.avg("Test1", 486.f);
UASSERT(p.getValue("Test1") == 123.f);
p.avg("Test1", 8);
UASSERT(p.getValue("Test1") == 100.f);
p.avg("Test1", 700);
UASSERT(p.getValue("Test1") == 200.f);
p.avg("Test1", 10000);
UASSERT(p.getValue("Test1") == 1600.f);
p.avg("Test2", 123.56);
p.avg("Test2", 123.58);
UASSERT(p.getValue("Test2") == 123.57f);
}
};
#define TEST(X) do {\ #define TEST(X) do {\
X x;\ X x;\
infostream<<"Running " #X <<std::endl;\ infostream<<"Running " #X <<std::endl;\
@ -2155,6 +2190,7 @@ void run_tests()
TEST(TestCompress); TEST(TestCompress);
TEST(TestSerialization); TEST(TestSerialization);
TEST(TestNodedefSerialization); TEST(TestNodedefSerialization);
TEST(TestProfiler);
TESTPARAMS(TestMapNode, ndef); TESTPARAMS(TestMapNode, ndef);
TESTPARAMS(TestVoxelManipulator, ndef); TESTPARAMS(TestVoxelManipulator, ndef);
TESTPARAMS(TestVoxelAlgorithms, ndef); TESTPARAMS(TestVoxelAlgorithms, ndef);