yolinlin/mod-playerbots
1
0
Fork 0
mirror of https://github.com/mod-playerbots/mod-playerbots synced 2025-11-29 15:58:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #470 from CiMaWi/pmon-improvements

Browse Source 
Performance Monitor Improvements
This commit is contained in:
Yunfan Li
2024-08-13 22:17:35 +08:00
committed by GitHub
parent e522db810c 4d5dd0e2fc
commit 6c5a80e8ba
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)
{
case PERF_MON_TRIGGER:
key = "T";
key = "Trigger";
break;
case PERF_MON_VALUE:
key = "V";
key = "Value";
break;
case PERF_MON_ACTION:
key = "A";
key = "Action";
break;
case PERF_MON_RNDBOT:
key = "RndBot";
@@ -152,8 +152,8 @@ void PerformanceMonitor::PrintStats(bool perTick, bool fullStack)
}
else
{
float fullTickCount = data[PERF_MON_TOTAL]["RandomPlayerbotMgr::FullTick"]->count;
float fullTickTotalTime = data[PERF_MON_TOTAL]["RandomPlayerbotMgr::FullTick"]->totalTime;
float fullTickCount = data[PERF_MON_TOTAL]["PlayerbotAIBase::FullTick"]->count;
float fullTickTotalTime = data[PERF_MON_TOTAL]["PlayerbotAIBase::FullTick"]->totalTime;
LOG_INFO(
"playerbots",
@@ -173,13 +173,13 @@ void PerformanceMonitor::PrintStats(bool perTick, bool fullStack)
switch (i->first)
{
case PERF_MON_TRIGGER:
key = "T";
key = "Trigger";
break;
case PERF_MON_VALUE:
key = "V";
key = "Value";
break;
case PERF_MON_ACTION:
key = "A";
key = "Action";
break;
case PERF_MON_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());
}
}
if (PERF_MON_TOTAL != i->first)
if (i->first != PERF_MON_TOTAL)
{
float tPerc = (float)typeTotalTime / (float)fullTickTotalTime * 100.0f;
float tTime = (float)typeTotalTime / fullTickCount / 1000.0f;
@@ -278,7 +278,7 @@ void PerformanceMonitorOperation::finish()
std::chrono::microseconds finished =
(std::chrono::time_point_cast<std::chrono::microseconds>(std::chrono::high_resolution_clock::now()))
.time_since_epoch();
uint64_t elapsed = (finished - started).count();
uint64 elapsed = (finished - started).count();
std::lock_guard<std::mutex> guard(data->lock);
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)
{
if (totalPmo)
totalPmo->finish();
totalPmo = sPerformanceMonitor->start(PERF_MON_TOTAL, "PlayerbotAIBase::FullTick");
if (nextAICheckDelay > elapsed)
nextAICheckDelay -= elapsed;
else

1
src/PlayerbotAIBase.h
View File

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

2
src/RandomPlayerbotMgr.cpp
View File

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

3
src/RandomPlayerbotMgr.h
View File

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

10
src/cs_playerbots.cpp
View File

@@ -83,6 +83,16 @@ public:
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();
return true;
}