Export PROFILER_TYPE_NONE. Export get_type. Do not reset data on …

…reinit.
OpenXRay · Jan 18, 2025 · 8ab3dc0 · 8ab3dc0
1 parent c9abb43
commit 8ab3dc0
Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/src/xrScriptEngine/ScriptEngineScript.cpp b/src/xrScriptEngine/ScriptEngineScript.cpp
@@ -140,6 +140,7 @@ SCRIPT_EXPORT(CScriptEngine, (),
 {
     using namespace luabind;
 
+    globals(luaState) ["PROFILER_TYPE_NONE"] = (u32) CScriptProfilerType::None;
     globals(luaState) ["PROFILER_TYPE_HOOK"] = (u32) CScriptProfilerType::Hook;
     globals(luaState) ["PROFILER_TYPE_SAMPLING"] = (u32) CScriptProfilerType::Sampling;
 
@@ -175,18 +176,22 @@ SCRIPT_EXPORT(CScriptEngine, (),
         {
             GEnv.ScriptEngine->m_profiler->isActive();
         }),
-        def("start", +[](CScriptProfilerType hook_type = CScriptProfilerType::None)
+        def("get_type", +[]()
         {
-            GEnv.ScriptEngine->m_profiler->start(hook_type);
+            GEnv.ScriptEngine->m_profiler->getType();
         }),
-        def("start_sampling_mode", +[](u32 sampling_interval = CScriptProfiler::PROFILE_SAMPLING_INTERVAL_DEFAULT)
+        def("start", +[](CScriptProfilerType hook_type = CScriptProfilerType::None)
         {
-            GEnv.ScriptEngine->m_profiler->startSamplingMode(sampling_interval);
+            GEnv.ScriptEngine->m_profiler->start(hook_type);
         }),
         def("start_hook_mode", +[]()
         {
             GEnv.ScriptEngine->m_profiler->startHookMode();
         }),
+        def("start_sampling_mode", +[](u32 sampling_interval = CScriptProfiler::PROFILE_SAMPLING_INTERVAL_DEFAULT)
+        {
+            GEnv.ScriptEngine->m_profiler->startSamplingMode(sampling_interval);
+        }),
         def("stop", +[]()
         {
             GEnv.ScriptEngine->m_profiler->stop();

diff --git a/src/xrScriptEngine/script_profiler.cpp b/src/xrScriptEngine/script_profiler.cpp
@@ -533,7 +533,6 @@ void CScriptProfiler::onReinit(lua_State* L)
         }
 
         Msg("[P] Reinit scripts hook profiler");
-        m_hook_profiling_portions.clear();
 
         return;
     case CScriptProfilerType::Sampling:
@@ -546,7 +545,6 @@ void CScriptProfiler::onReinit(lua_State* L)
 
         Msg("[P] Re-init scripts sampling profiler - attach handler, interval: %d", m_sampling_profile_interval);
         luaJitSamplingProfilerAttach(this, m_sampling_profile_interval);
-        m_sampling_profiling_log.clear();
 
         return;
     }