mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-31 21:45:33 +00:00
Code Issues Releases Wiki Activity

Report navigator stats

Browse source
This commit is contained in:
elsid 2019-03-17 20:18:53 +03:00
parent 2c78d530a2
commit 4624f31788
No known key found for this signature in database
GPG key ID: B845CB9FEE18AB40
12 changed files with 83 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/openmw/engine.cpp
View file

@ -32,6 +32,8 @@
#include <components/version/version.hpp>
#include <components/detournavigator/navigator.hpp>
#include "mwinput/inputmanagerimp.hpp"
#include "mwgui/windowmanagerimp.hpp"
@ -198,6 +200,8 @@ bool OMW::Engine::frame(float frametime)
stats->setAttribute(frameNumber, "WorkQueue", mWorkQueue->getNumItems());
stats->setAttribute(frameNumber, "WorkThread", mWorkQueue->getNumActiveThreads());
mEnvironment.getWorld()->getNavigator()->reportStats(frameNumber, *stats);
}
}

16
components/detournavigator/asyncnavmeshupdater.cpp
View file

@ -5,6 +5,8 @@
#include <components/debug/debuglog.hpp>
#include <osg/Stats>
namespace
{
using DetourNavigator::ChangeType;
@ -102,6 +104,20 @@ namespace DetourNavigator
mDone.wait(lock, [&] { return mJobs.empty(); });
}
void AsyncNavMeshUpdater::reportStats(unsigned int frameNumber, osg::Stats& stats) const
{
std::size_t jobs = 0;
{
const std::lock_guard<std::mutex> lock(mMutex);
jobs = mJobs.size();
}
stats.setAttribute(frameNumber, "NavMesh UpdateJobs", jobs);
mNavMeshTilesCache.reportStats(frameNumber, stats);
}
void AsyncNavMeshUpdater::process() throw()
{
log("start process jobs");

4
components/detournavigator/asyncnavmeshupdater.hpp
View file

@ -44,6 +44,8 @@ namespace DetourNavigator
void wait();
void reportStats(unsigned int frameNumber, osg::Stats& stats) const;
private:
struct Job
{
@ -72,7 +74,7 @@ namespace DetourNavigator
std::reference_wrapper<TileCachedRecastMeshManager> mRecastMeshManager;
std::reference_wrapper<OffMeshConnectionsManager> mOffMeshConnectionsManager;
std::atomic_bool mShouldStop;
std::mutex mMutex;
mutable std::mutex mMutex;
std::condition_variable mHasJob;
std::condition_variable mDone;
Jobs mJobs;

2
components/detournavigator/navigator.hpp
View file

@ -192,6 +192,8 @@ namespace DetourNavigator
virtual std::map<osg::Vec3f, SharedNavMeshCacheItem> getNavMeshes() const = 0;
virtual const Settings& getSettings() const = 0;
virtual void reportStats(unsigned int frameNumber, osg::Stats& stats) const = 0;
};
}

5
components/detournavigator/navigatorimpl.cpp
View file

@ -138,6 +138,11 @@ namespace DetourNavigator
return mSettings;
}
void NavigatorImpl::reportStats(unsigned int frameNumber, osg::Stats& stats) const
{
mNavMeshManager.reportStats(frameNumber, stats);
}
void NavigatorImpl::updateAvoidShapeId(const ObjectId id, const ObjectId avoidId)
{
updateId(id, avoidId, mWaterIds);

2
components/detournavigator/navigatorimpl.hpp
View file

@ -48,6 +48,8 @@ namespace DetourNavigator
const Settings& getSettings() const override;
void reportStats(unsigned int frameNumber, osg::Stats& stats) const override;
private:
Settings mSettings;
NavMeshManager mNavMeshManager;

2
components/detournavigator/navigatorstub.hpp
View file

@ -79,6 +79,8 @@ namespace DetourNavigator
return mDefaultSettings;
}
void reportStats(unsigned int /*frameNumber*/, osg::Stats& /*stats*/) const override {}
private:
Settings mDefaultSettings {};
SharedNavMeshCacheItem mEmptyNavMeshCacheItem;

5
components/detournavigator/navmeshmanager.cpp
View file

@ -212,6 +212,11 @@ namespace DetourNavigator
return mCache;
}
void NavMeshManager::reportStats(unsigned int frameNumber, osg::Stats& stats) const
{
mAsyncNavMeshUpdater.reportStats(frameNumber, stats);
}
void NavMeshManager::addChangedTiles(const btCollisionShape& shape, const btTransform& transform,
const ChangeType changeType)
{

2
components/detournavigator/navmeshmanager.hpp
View file

@ -50,6 +50,8 @@ namespace DetourNavigator
std::map<osg::Vec3f, SharedNavMeshCacheItem> getNavMeshes() const;
void reportStats(unsigned int frameNumber, osg::Stats& stats) const;
private:
const Settings& mSettings;
TileCachedRecastMeshManager mRecastMeshManager;

20
components/detournavigator/navmeshtilescache.cpp
View file

@ -1,6 +1,8 @@
#include "navmeshtilescache.hpp"
#include "exceptions.hpp"
#include <osg/Stats>
#include <cstring>
namespace DetourNavigator
@ -113,6 +115,24 @@ namespace DetourNavigator
return Value(*this, iterator);
}
void NavMeshTilesCache::reportStats(unsigned int frameNumber, osg::Stats& stats) const
{
std::size_t navMeshCacheSize = 0;
std::size_t usedNavMeshTiles = 0;
std::size_t cachedNavMeshTiles = 0;
{
const std::lock_guard<std::mutex> lock(mMutex);
navMeshCacheSize = mUsedNavMeshDataSize;
usedNavMeshTiles = mBusyItems.size();
cachedNavMeshTiles = mFreeItems.size();
}
stats.setAttribute(frameNumber, "NavMesh CacheSize", navMeshCacheSize);
stats.setAttribute(frameNumber, "NavMesh UsedTiles", usedNavMeshTiles);
stats.setAttribute(frameNumber, "NavMesh CachedTiles", cachedNavMeshTiles);
}
void NavMeshTilesCache::removeLeastRecentlyUsed()
{
const auto& item = mFreeItems.back();

9
components/detournavigator/navmeshtilescache.hpp
View file

@ -12,6 +12,11 @@
#include <mutex>
#include <cassert>
namespace osg
{
class Stats;
}
namespace DetourNavigator
{
struct NavMeshDataRef
@ -105,6 +110,8 @@ namespace DetourNavigator
const RecastMesh& recastMesh, const std::vector<OffMeshConnection>& offMeshConnections,
NavMeshData&& value);
void reportStats(unsigned int frameNumber, osg::Stats& stats) const;
private:
class KeyView
{
@ -164,7 +171,7 @@ namespace DetourNavigator
std::map<KeyView, ItemIterator> mMap;
};
std::mutex mMutex;
mutable std::mutex mMutex;
std::size_t mMaxNavMeshDataSize;
std::size_t mUsedNavMeshDataSize;
std::size_t mFreeNavMeshDataSize;

19
components/resource/stats.cpp
View file

@ -2,6 +2,7 @@
#include <sstream>
#include <iomanip>
#include <algorithm>
#include <osg/PolygonMode>
@ -255,7 +256,7 @@ void StatsHandler::setUpScene(osgViewer::ViewerBase *viewer)
stateset->setAttribute(new osg::PolygonMode(), osg::StateAttribute::PROTECTED);
#endif
osg::Vec3 pos(_statsWidth-300.f, _statsHeight-500.0f,0.0f);
osg::Vec3 pos(_statsWidth-420.f, _statsHeight-500.0f,0.0f);
osg::Vec4 backgroundColor(0.0, 0.0, 0.0f, 0.3);
osg::Vec4 staticTextColor(1.0, 1.0, 0.0f, 1.0);
osg::Vec4 dynamicTextColor(1.0, 1.0, 1.0f, 1.0);
@ -290,12 +291,20 @@ void StatsHandler::setUpScene(osgViewer::ViewerBase *viewer)
"Composite",
"",
"UnrefQueue",
"",
"NavMesh UpdateJobs",
"NavMesh CacheSize",
"NavMesh UsedTiles",
"NavMesh CachedTiles",
});
static const auto longest = std::max_element(statNames.begin(), statNames.end(),
[] (const std::string& lhs, const std::string& rhs) { return lhs.size() < rhs.size(); });
const int numLines = statNames.size();
const float statNamesWidth = 13 * _characterSize + 2 * backgroundMargin;
group->addChild(createBackgroundRectangle(pos + osg::Vec3(-backgroundMargin, _characterSize + backgroundMargin, 0),
10 * _characterSize + 2 * backgroundMargin,
statNamesWidth,
numLines * _characterSize + 2 * backgroundMargin,
backgroundColor));
@ -309,7 +318,7 @@ void StatsHandler::setUpScene(osgViewer::ViewerBase *viewer)
std::ostringstream viewStr;
viewStr.clear();
viewStr.setf(std::ios::left, std::ios::adjustfield);
viewStr.width(14);
viewStr.width(longest->size());
for (const auto& statName : statNames)
{
viewStr << statName << std::endl;
@ -317,10 +326,10 @@ void StatsHandler::setUpScene(osgViewer::ViewerBase *viewer)
staticText->setText(viewStr.str());
pos.x() += 10 * _characterSize + 2 * backgroundMargin + backgroundSpacing;
pos.x() += statNamesWidth + backgroundSpacing;
group->addChild(createBackgroundRectangle(pos + osg::Vec3(-backgroundMargin, _characterSize + backgroundMargin, 0),
5 * _characterSize + 2 * backgroundMargin,
7 * _characterSize + 2 * backgroundMargin,
numLines * _characterSize + 2 * backgroundMargin,
backgroundColor));