Merge branch 'lua_stats_used_memory_48' into 'openmw-48'

Report used memory by Lua interpreter (0.48)

See merge request OpenMW/openmw!2445

apps/openmw/engine.cpp

@@ -440,7 +440,9 @@ bool OMW::Engine::frame(float frametime)
             stats->setAttribute(frameNumber, "WorkQueue", mWorkQueue->getNumItems());
             stats->setAttribute(frameNumber, "WorkThread", mWorkQueue->getNumActiveThreads());
 
-            mEnvironment.reportStats(frameNumber, *stats);
+            mMechanicsManager->reportStats(frameNumber, *stats);
+            mWorld->reportStats(frameNumber, *stats);
+            mLuaManager->reportStats(frameNumber, *stats);
         }
     }
     catch (const std::exception& e)

apps/openmw/mwbase/environment.cpp

@@ -4,17 +4,6 @@
 
 #include <components/resource/resourcesystem.hpp>
 
-#include "world.hpp"
-#include "scriptmanager.hpp"
-#include "dialoguemanager.hpp"
-#include "journal.hpp"
-#include "soundmanager.hpp"
-#include "mechanicsmanager.hpp"
-#include "inputmanager.hpp"
-#include "windowmanager.hpp"
-#include "statemanager.hpp"
-#include "luamanager.hpp"
-
 MWBase::Environment *MWBase::Environment::sThis = nullptr;
 
 MWBase::Environment::Environment()
@@ -27,9 +16,3 @@ MWBase::Environment::~Environment()
 {
     sThis = nullptr;
 }
-
-void MWBase::Environment::reportStats(unsigned int frameNumber, osg::Stats& stats) const
-{
-    mMechanicsManager->reportStats(frameNumber, stats);
-    mWorld->reportStats(frameNumber, stats);
-}

apps/openmw/mwbase/environment.hpp

@@ -5,11 +5,6 @@
 
 #include <memory>
 
-namespace osg
-{
-    class Stats;
-}
-
 namespace Resource
 {
     class ResourceSystem;
@@ -118,8 +113,6 @@ namespace MWBase
                 assert(sThis != nullptr);
                 return *sThis;
             }
-
-            void reportStats(unsigned int frameNumber, osg::Stats& stats) const;
     };
 }
 

apps/openmw/mwlua/luamanagerimp.cpp

@@ -1,5 +1,9 @@
 #include "luamanagerimp.hpp"
 
+#include <osg/Stats>
+
+#include "sol/state_view.hpp"
+
 #include <components/debug/debuglog.hpp>
 
 #include <components/esm3/esmreader.hpp>
@@ -598,4 +602,9 @@ namespace MWLua
         mActionQueue.push_back(std::make_unique<FunctionAction>(&mLua, std::move(action), name));
     }
 
+    void LuaManager::reportStats(unsigned int frameNumber, osg::Stats& stats)
+    {
+        const sol::state_view state(mLua.sol());
+        stats.setAttribute(frameNumber, "Lua UsedMemory", state.memory_used());
+    }
 }

apps/openmw/mwlua/luamanagerimp.hpp

@@ -126,6 +126,8 @@ namespace MWLua
 
         bool isProcessingInputEvents() const { return mProcessingInputEvents; }
 
+        void reportStats(unsigned int frameNumber, osg::Stats& stats);
+
     private:
         void initConfiguration();
         LocalScripts* createLocalScripts(const MWWorld::Ptr& ptr,

components/resource/stats.cpp

@@ -453,6 +453,8 @@ void StatsHandler::setUpScene(osgViewer::ViewerBase *viewer)
             "Physics Objects",
             "Physics Projectiles",
             "Physics HeightFields",
+            "",
+            "Lua UsedMemory",
         });
 
         static const auto longest = std::max_element(statNames.begin(), statNames.end(),