nchebrov/mod-playerbots
1
0
Fork 0
mirror of https://github.com/mod-playerbots/mod-playerbots.git synced 2026-01-13 00:58:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Performance Monitor Improvements:

Browse Source 
1. Added command for runtime toggle
2. Changed where tick time is captured to properly capture per-tick statistics (matching cmangos playerbots)
This commit is contained in:
Christoph Wilk
2024-08-13 17:38:57 +09:00
parent e522db810c
commit 4d5dd0e2fc
6 changed files with 28 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/PerformanceMonitor.cpp
View File

@@ -78,13 +78,13 @@ void PerformanceMonitor::PrintStats(bool perTick, bool fullStack)
switch (i->first) switch (i->first)
{ {
case PERF_MON_TRIGGER: case PERF_MON_TRIGGER:
key = "T"; key = "Trigger";
break; break;
case PERF_MON_VALUE: case PERF_MON_VALUE:
key = "V"; key = "Value";
break; break;
case PERF_MON_ACTION: case PERF_MON_ACTION:
key = "A"; key = "Action";
break; break;
case PERF_MON_RNDBOT: case PERF_MON_RNDBOT:
key = "RndBot"; key = "RndBot";
@@ -152,8 +152,8 @@ void PerformanceMonitor::PrintStats(bool perTick, bool fullStack)
} }
else else
{ {
float fullTickCount = data[PERF_MON_TOTAL]["RandomPlayerbotMgr::FullTick"]->count; float fullTickCount = data[PERF_MON_TOTAL]["PlayerbotAIBase::FullTick"]->count;
float fullTickTotalTime = data[PERF_MON_TOTAL]["RandomPlayerbotMgr::FullTick"]->totalTime; float fullTickTotalTime = data[PERF_MON_TOTAL]["PlayerbotAIBase::FullTick"]->totalTime;
LOG_INFO( LOG_INFO(
"playerbots", "playerbots",
@@ -173,13 +173,13 @@ void PerformanceMonitor::PrintStats(bool perTick, bool fullStack)
switch (i->first) switch (i->first)
{ {
case PERF_MON_TRIGGER: case PERF_MON_TRIGGER:
key = "T"; key = "Trigger";
break; break;
case PERF_MON_VALUE: case PERF_MON_VALUE:
key = "V"; key = "Value";
break; break;
case PERF_MON_ACTION: case PERF_MON_ACTION:
key = "A"; key = "Action";
break; break;
case PERF_MON_RNDBOT: case PERF_MON_RNDBOT:
key = "RndBot"; key = "RndBot";
@@ -231,7 +231,7 @@ void PerformanceMonitor::PrintStats(bool perTick, bool fullStack)
time, minTime, maxTime, avg, amount, key.c_str(), disName.c_str()); time, minTime, maxTime, avg, amount, key.c_str(), disName.c_str());
} }
} }
if (PERF_MON_TOTAL != i->first) if (i->first != PERF_MON_TOTAL)
{ {
float tPerc = (float)typeTotalTime / (float)fullTickTotalTime * 100.0f; float tPerc = (float)typeTotalTime / (float)fullTickTotalTime * 100.0f;
float tTime = (float)typeTotalTime / fullTickCount / 1000.0f; float tTime = (float)typeTotalTime / fullTickCount / 1000.0f;
@@ -278,7 +278,7 @@ void PerformanceMonitorOperation::finish()
std::chrono::microseconds finished = std::chrono::microseconds finished =
(std::chrono::time_point_cast<std::chrono::microseconds>(std::chrono::high_resolution_clock::now())) (std::chrono::time_point_cast<std::chrono::microseconds>(std::chrono::high_resolution_clock::now()))
.time_since_epoch(); .time_since_epoch();
uint64_t elapsed = (finished - started).count(); uint64 elapsed = (finished - started).count();
std::lock_guard<std::mutex> guard(data->lock); std::lock_guard<std::mutex> guard(data->lock);
if (elapsed > 0) if (elapsed > 0)

5
src/PlayerbotAIBase.cpp
View File

@@ -11,6 +11,11 @@ PlayerbotAIBase::PlayerbotAIBase(bool isBotAI) : nextAICheckDelay(0), _isBotAI(i
void PlayerbotAIBase::UpdateAI(uint32 elapsed, bool minimal) void PlayerbotAIBase::UpdateAI(uint32 elapsed, bool minimal)
{ {
if (totalPmo)
totalPmo->finish();
totalPmo = sPerformanceMonitor->start(PERF_MON_TOTAL, "PlayerbotAIBase::FullTick");
if (nextAICheckDelay > elapsed) if (nextAICheckDelay > elapsed)
nextAICheckDelay -= elapsed; nextAICheckDelay -= elapsed;
else else

1
src/PlayerbotAIBase.h
View File

@@ -24,6 +24,7 @@ public:
protected: protected:
uint32 nextAICheckDelay; uint32 nextAICheckDelay;
class PerformanceMonitorOperation* totalPmo = nullptr;
private: private:
bool _isBotAI; bool _isBotAI;

2
src/RandomPlayerbotMgr.cpp
View File

@@ -153,7 +153,7 @@ double botPIDImpl::calculate(double setpoint, double pv)
botPIDImpl::~botPIDImpl() {} botPIDImpl::~botPIDImpl() {}
RandomPlayerbotMgr::RandomPlayerbotMgr() : PlayerbotHolder(), processTicks(0), totalPmo(nullptr) RandomPlayerbotMgr::RandomPlayerbotMgr() : PlayerbotHolder(), processTicks(0)
{ {
playersLevel = sPlayerbotAIConfig->randombotStartingLevel; playersLevel = sPlayerbotAIConfig->randombotStartingLevel;

3
src/RandomPlayerbotMgr.h
View File

@@ -204,9 +204,8 @@ private:
std::list<uint32> currentBots; std::list<uint32> currentBots;
uint32 bgBotsCount; uint32 bgBotsCount;
uint32 playersLevel; uint32 playersLevel;
PerformanceMonitorOperation* totalPmo;
}; };
#define sRandomPlayerbotMgr RandomPlayerbotMgr::instance() #define sRandomPlayerbotMgr RandomPlayerbotMgr::instance()
#endif #endif

10
src/cs_playerbots.cpp
View File

@@ -83,6 +83,16 @@ public:
return true; return true;
} }
if (!strcmp(args, "toggle"))
{
sPlayerbotAIConfig->perfMonEnabled = !sPlayerbotAIConfig->perfMonEnabled;
if (sPlayerbotAIConfig->perfMonEnabled)
LOG_INFO("playerbots", "Performance monitor enabled");
else
LOG_INFO("playerbots", "Performance monitor disabled");
return true;
}
sPerformanceMonitor->PrintStats(); sPerformanceMonitor->PrintStats();
return true; return true;
} }