mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-21 07:53:53 +00:00
Code Issues Releases Wiki Activity

Merge pull request #2807 from elsid/detournavigator_thread_jobs_stats

Browse source 
Add number of thread jobs to update jobs stats
This commit is contained in:
Alexei Dobrohotov 2020-04-26 22:44:59 +03:00 committed by GitHub
commit f5b42107d3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
components/detournavigator/asyncnavmeshupdater.cpp
View file

@ -7,6 +7,8 @@
#include <osg/Stats>
#include <numeric>
namespace
{
using DetourNavigator::ChangeType;
@ -101,7 +103,7 @@ namespace DetourNavigator
void AsyncNavMeshUpdater::wait()
{
std::unique_lock<std::mutex> lock(mMutex);
mDone.wait(lock, [&] { return mJobs.empty(); });
mDone.wait(lock, [&] { return mJobs.empty() && getTotalThreadJobsUnsafe() == 0; });
}
void AsyncNavMeshUpdater::reportStats(unsigned int frameNumber, osg::Stats& stats) const
@ -110,7 +112,7 @@ namespace DetourNavigator
{
const std::lock_guard<std::mutex> lock(mMutex);
jobs = mJobs.size();
jobs = mJobs.size() + getTotalThreadJobsUnsafe();
}
stats.setAttribute(frameNumber, "NavMesh UpdateJobs", jobs);
@ -188,11 +190,12 @@ namespace DetourNavigator
while (true)
{
const auto hasJob = [&] { return !mJobs.empty() || !threadQueue.mPushed.empty(); };
const auto hasJob = [&] { return !mJobs.empty() || !threadQueue.mJobs.empty(); };
if (!mHasJob.wait_for(lock, std::chrono::milliseconds(10), hasJob))
{
mFirstStart.lock()->reset();
if (getTotalThreadJobsUnsafe() == 0)
mDone.notify_all();
return boost::none;
}
@ -327,4 +330,10 @@ namespace DetourNavigator
if (agent->second.empty())
locked->erase(agent);
}
std::size_t AsyncNavMeshUpdater::getTotalThreadJobsUnsafe() const
{
return std::accumulate(mThreadsQueues.begin(), mThreadsQueues.end(), std::size_t(0),
[] (auto r, const auto& v) { return r + v.second.mJobs.size(); });
}
}

2
components/detournavigator/asyncnavmeshupdater.hpp
View file

@ -114,6 +114,8 @@ namespace DetourNavigator
std::thread::id lockTile(const osg::Vec3f& agentHalfExtents, const TilePosition& changedTile);
void unlockTile(const osg::Vec3f& agentHalfExtents, const TilePosition& changedTile);
inline std::size_t getTotalThreadJobsUnsafe() const;
};
}