Add resource statistics panel opened with F4

OpenMW · Feb 22, 2017 · 8f79fa3 · 8f79fa3
1 parent b40ca9b
commit 8f79fa3
Show file tree

Hide file tree

Showing 32 changed files with 549 additions and 11 deletions.
diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp
@@ -21,6 +21,7 @@
 
 #include <components/resource/resourcesystem.hpp>
 #include <components/resource/scenemanager.hpp>
+#include <components/resource/stats.hpp>
 
 #include <components/compiler/extensions0.hpp>
 
@@ -169,7 +170,7 @@ void OMW::Engine::frame(float frametime)
             mEnvironment.getWindowManager()->update();
         }
 
-        int frameNumber = mViewer->getFrameStamp()->getFrameNumber();
+        unsigned int frameNumber = mViewer->getFrameStamp()->getFrameNumber();
         osg::Stats* stats = mViewer->getViewerStats();
         stats->setAttribute(frameNumber, "script_time_begin", osg::Timer::instance()->delta_s(mStartTick, beforeScriptTick));
         stats->setAttribute(frameNumber, "script_time_taken", osg::Timer::instance()->delta_s(beforeScriptTick, afterScriptTick));
@@ -183,6 +184,14 @@ void OMW::Engine::frame(float frametime)
         stats->setAttribute(frameNumber, "physics_time_taken", osg::Timer::instance()->delta_s(beforePhysicsTick, afterPhysicsTick));
         stats->setAttribute(frameNumber, "physics_time_end", osg::Timer::instance()->delta_s(mStartTick, afterPhysicsTick));
 
+        if (stats->collectStats("resource"))
+        {
+            mResourceSystem->reportStats(frameNumber, stats);
+
+            stats->setAttribute(frameNumber, "WorkQueue", mWorkQueue->getNumItems());
+            stats->setAttribute(frameNumber, "WorkThread", mWorkQueue->getNumActiveThreads());
+        }
+
     }
     catch (const std::exception& e)
     {
@@ -635,6 +644,8 @@ void OMW::Engine::go()
 
     mViewer->addEventHandler(statshandler);
 
+    mViewer->addEventHandler(new Resource::StatsHandler);
+
     Settings::Manager settings;
     std::string settingspath;
 

diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
@@ -475,6 +475,8 @@ namespace MWRender
 
     void RenderingManager::update(float dt, bool paused)
     {
+        reportStats();
+
         mUnrefQueue->flush(mWorkQueue.get());
 
         if (!paused)
@@ -901,6 +903,18 @@ namespace MWRender
         mStateUpdater->setFogColor(color);
     }
 
+    void RenderingManager::reportStats()
+    {
+        osg::Stats* stats = mViewer->getViewerStats();
+        unsigned int frameNumber = mViewer->getFrameStamp()->getFrameNumber();
+        if (stats->collectStats("resource"))
+        {
+            stats->setAttribute(frameNumber, "UnrefQueue", mUnrefQueue->getNumItems());
+
+            mTerrain->reportStats(frameNumber, stats);
+        }
+    }
+
     void RenderingManager::processChangedSettings(const Settings::CategorySettingVector &changed)
     {
         for (Settings::CategorySettingVector::const_iterator it = changed.begin(); it != changed.end(); ++it)

diff --git a/apps/openmw/mwrender/renderingmanager.hpp b/apps/openmw/mwrender/renderingmanager.hpp
@@ -196,6 +196,8 @@ namespace MWRender
         void updateAmbient();
         void setFogColor(const osg::Vec4f& color);
 
+        void reportStats();
+
         osg::ref_ptr<osgViewer::Viewer> mViewer;
         osg::ref_ptr<osg::Group> mRootNode;
         osg::ref_ptr<osg::Group> mSceneRoot;

diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
@@ -41,7 +41,7 @@ add_component_dir (vfs
     )
 
 add_component_dir (resource
-    scenemanager keyframemanager imagemanager bulletshapemanager bulletshape niffilemanager objectcache multiobjectcache resourcesystem resourcemanager
+    scenemanager keyframemanager imagemanager bulletshapemanager bulletshape niffilemanager objectcache multiobjectcache resourcesystem resourcemanager stats
     )
 
 add_component_dir (shader
@@ -202,6 +202,7 @@ target_link_libraries(components
     ${OSGUTIL_LIBRARIES}
     ${OSGDB_LIBRARIES}
     ${OSGVIEWER_LIBRARIES}
+    ${OSGTEXT_LIBRARIES}
     ${OSGGA_LIBRARIES}
     ${OSGFX_LIBRARIES}
     ${OSGANIMATION_LIBRARIES}

diff --git a/components/resource/bulletshapemanager.cpp b/components/resource/bulletshapemanager.cpp
@@ -185,4 +185,10 @@ void BulletShapeManager::updateCache(double referenceTime)
     mInstanceCache->removeUnreferencedObjectsInCache();
 }
 
+void BulletShapeManager::reportStats(unsigned int frameNumber, osg::Stats *stats)
+{
+    stats->setAttribute(frameNumber, "Shape", mCache->getCacheSize());
+    stats->setAttribute(frameNumber, "Shape Instance", mInstanceCache->getCacheSize());
+}
+
 }
diff --git a/components/resource/bulletshapemanager.hpp b/components/resource/bulletshapemanager.hpp
@@ -42,6 +42,8 @@ namespace Resource
         /// @see ResourceManager::updateCache
         virtual void updateCache(double referenceTime);
 
+        void reportStats(unsigned int frameNumber, osg::Stats *stats);
+
     private:
         osg::ref_ptr<BulletShapeInstance> createInstance(const std::string& name);
 

diff --git a/components/resource/imagemanager.cpp b/components/resource/imagemanager.cpp
@@ -141,4 +141,9 @@ namespace Resource
         return mWarningImage;
     }
 
+    void ImageManager::reportStats(unsigned int frameNumber, osg::Stats *stats)
+    {
+        stats->setAttribute(frameNumber, "Image", mCache->getCacheSize());
+    }
+
 }
diff --git a/components/resource/imagemanager.hpp b/components/resource/imagemanager.hpp
@@ -32,6 +32,8 @@ namespace Resource
 
         osg::Image* getWarningImage();
 
+        void reportStats(unsigned int frameNumber, osg::Stats* stats);
+
     private:
         osg::ref_ptr<osg::Image> mWarningImage;
         osg::ref_ptr<osgDB::Options> mOptions;

diff --git a/components/resource/keyframemanager.cpp b/components/resource/keyframemanager.cpp
@@ -34,6 +34,11 @@ namespace Resource
         }
     }
 
+    void KeyframeManager::reportStats(unsigned int frameNumber, osg::Stats *stats)
+    {
+        stats->setAttribute(frameNumber, "Keyframe", mCache->getCacheSize());
+    }
+
 
 
 }
diff --git a/components/resource/keyframemanager.hpp b/components/resource/keyframemanager.hpp
@@ -22,6 +22,8 @@ namespace Resource
         /// Retrieve a read-only keyframe resource by name (case-insensitive).
         /// @note Throws an exception if the resource is not found.
         osg::ref_ptr<const NifOsg::KeyframeHolder> get(const std::string& name);
+
+        void reportStats(unsigned int frameNumber, osg::Stats* stats);
     };
 
 }

diff --git a/components/resource/multiobjectcache.cpp b/components/resource/multiobjectcache.cpp
@@ -76,4 +76,10 @@ namespace Resource
         }
     }
 
+    unsigned int MultiObjectCache::getCacheSize() const
+    {
+        OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_objectCacheMutex);
+        return _objectCache.size();
+    }
+
 }
diff --git a/components/resource/multiobjectcache.hpp b/components/resource/multiobjectcache.hpp
@@ -33,12 +33,14 @@ namespace Resource
         /** call releaseGLObjects on all objects attached to the object cache.*/
         void releaseGLObjects(osg::State* state);
 
+        unsigned int getCacheSize() const;
+
     protected:
 
         typedef std::multimap<std::string, osg::ref_ptr<osg::Object> >             ObjectCacheMap;
 
         ObjectCacheMap                          _objectCache;
-        OpenThreads::Mutex                      _objectCacheMutex;
+        mutable OpenThreads::Mutex              _objectCacheMutex;
 
     };
 

diff --git a/components/resource/niffilemanager.cpp b/components/resource/niffilemanager.cpp
@@ -1,6 +1,7 @@
 #include "niffilemanager.hpp"
 
 #include <osg/Object>
+#include <osg/Stats>
 
 #include <components/vfs/manager.hpp>
 
@@ -55,4 +56,9 @@ namespace Resource
         }
     }
 
+    void NifFileManager::reportStats(unsigned int frameNumber, osg::Stats *stats)
+    {
+        stats->setAttribute(frameNumber, "Nif", mCache->getCacheSize());
+    }
+
 }
diff --git a/components/resource/niffilemanager.hpp b/components/resource/niffilemanager.hpp
@@ -22,6 +22,8 @@ namespace Resource
         /// @note For performance reasons the NifFileManager does not handle case folding, needs
         /// to be done in advance by other managers accessing the NifFileManager.
         Nif::NIFFilePtr get(const std::string& name);
+
+        void reportStats(unsigned int frameNumber, osg::Stats *stats);
     };
 
 }

diff --git a/components/resource/objectcache.cpp b/components/resource/objectcache.cpp
@@ -150,4 +150,10 @@ void ObjectCache::accept(osg::NodeVisitor &nv)
     }
 }
 
+unsigned int ObjectCache::getCacheSize() const
+{
+    OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_objectCacheMutex);
+    return _objectCache.size();
+}
+
 }
diff --git a/components/resource/objectcache.hpp b/components/resource/objectcache.hpp
@@ -73,6 +73,9 @@ class ObjectCache : public osg::Referenced
         /** call node->accept(nv); for all nodes in the objectCache. */
         void accept(osg::NodeVisitor& nv);
 
+        /** Get the number of objects in the cache. */
+        unsigned int getCacheSize() const;
+
     protected:
 
         virtual ~ObjectCache();
@@ -81,7 +84,7 @@ class ObjectCache : public osg::Referenced
         typedef std::map<std::string, ObjectTimeStampPair >             ObjectCacheMap;
 
         ObjectCacheMap                          _objectCache;
-        OpenThreads::Mutex                      _objectCacheMutex;
+        mutable OpenThreads::Mutex              _objectCacheMutex;
 
 };
 

diff --git a/components/resource/resourcemanager.hpp b/components/resource/resourcemanager.hpp
@@ -8,6 +8,11 @@ namespace VFS
     class Manager;
 }
 
+namespace osg
+{
+    class Stats;
+}
+
 namespace Resource
 {
     class ObjectCache;
@@ -28,6 +33,8 @@ namespace Resource
 
         const VFS::Manager* getVFS() const;
 
+        virtual void reportStats(unsigned int frameNumber, osg::Stats* stats) {}
+
     protected:
         const VFS::Manager* mVFS;
         osg::ref_ptr<Resource::ObjectCache> mCache;

diff --git a/components/resource/resourcesystem.cpp b/components/resource/resourcesystem.cpp
@@ -85,4 +85,10 @@ namespace Resource
         return mVFS;
     }
 
+    void ResourceSystem::reportStats(unsigned int frameNumber, osg::Stats *stats)
+    {
+        for (std::vector<ResourceManager*>::iterator it = mResourceManagers.begin(); it != mResourceManagers.end(); ++it)
+            (*it)->reportStats(frameNumber, stats);
+    }
+
 }
diff --git a/components/resource/resourcesystem.hpp b/components/resource/resourcesystem.hpp
@@ -9,6 +9,11 @@ namespace VFS
     class Manager;
 }
 
+namespace osg
+{
+    class Stats;
+}
+
 namespace Resource
 {
 
@@ -49,6 +54,8 @@ namespace Resource
         /// @note May be called from any thread.
         const VFS::Manager* getVFS() const;
 
+        void reportStats(unsigned int frameNumber, osg::Stats* stats);
+
     private:
         std::auto_ptr<SceneManager> mSceneManager;
         std::auto_ptr<ImageManager> mImageManager;

diff --git a/components/resource/scenemanager.cpp b/components/resource/scenemanager.cpp
@@ -585,4 +585,15 @@ namespace Resource
         mInstanceCache->removeUnreferencedObjectsInCache();
     }
 
+    void SceneManager::reportStats(unsigned int frameNumber, osg::Stats *stats)
+    {
+        {
+            OpenThreads::ScopedLock<OpenThreads::Mutex> lock(*mIncrementalCompileOperation->getToCompiledMutex());
+            stats->setAttribute(frameNumber, "Compiling", mIncrementalCompileOperation->getToCompile().size());
+        }
+
+        stats->setAttribute(frameNumber, "Node", mCache->getCacheSize());
+        stats->setAttribute(frameNumber, "Node Instance", mInstanceCache->getCacheSize());
+    }
+
 }
diff --git a/components/resource/scenemanager.hpp b/components/resource/scenemanager.hpp
@@ -139,6 +139,8 @@ namespace Resource
         /// @see ResourceManager::updateCache
         virtual void updateCache(double referenceTime);
 
+        virtual void reportStats(unsigned int frameNumber, osg::Stats* stats);
+
     private:
 
         osg::ref_ptr<osg::Node> createInstance(const std::string& name);