Safer checking for luaIsJitProfilerDefined.

OpenXRay · Jan 17, 2025 · d3d5aa3 · d3d5aa3
1 parent b734d1f
commit d3d5aa3
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 27 deletions.
diff --git a/src/xrScriptEngine/script_engine.cpp b/src/xrScriptEngine/script_engine.cpp
@@ -1046,7 +1046,9 @@ void CScriptEngine::init(ExporterFunc exporterFunc, bool loadGlobalNamespace)
     // if (jit == nil) then
     //     profiler.setup_hook()
     // end
-    if (!strstr(Core.Params, "-nojit"))
+    //
+    // Update: '-nojit' option adds garbage to stack and luabind calls fail
+    if (!strstr(Core.Params, ARGUMENT_ENGINE_NOJIT))
     {
         luajit::open_lib(lua(), LUA_JITLIBNAME, luaopen_jit);
         // Xottab_DUTY: commented this. Let's use default opt level, which is 3

diff --git a/src/xrScriptEngine/script_engine.hpp b/src/xrScriptEngine/script_engine.hpp
@@ -71,7 +71,8 @@ extern Flags32 XRSCRIPTENGINE_API g_LuaDebug;
 class XRSCRIPTENGINE_API CScriptEngine
 {
 public:
-    typedef AssociativeVector<ScriptProcessor, CScriptProcess*> CScriptProcessStorage;
+    constexpr static cpcstr ARGUMENT_ENGINE_NOJIT = "-nojit";
+	typedef AssociativeVector<ScriptProcessor, CScriptProcess*> CScriptProcessStorage;
     static const char* const GlobalNamespace;
 
 private:

diff --git a/src/xrScriptEngine/script_profiler.cpp b/src/xrScriptEngine/script_profiler.cpp
@@ -96,7 +96,7 @@ void CScriptProfiler::startSamplingMode(u32 sampling_interval)
 
     if (!luaIsJitProfilerDefined(lua()))
     {
-        Msg("[P] Cannot start scripts sampling profiler, jit.profiler module is not defined");
+        Msg("[P] Cannot start scripts sampling profiler, jit module is not defined");
 		return;
     }
 
@@ -499,33 +499,14 @@ int CScriptProfiler::luaMemoryUsed(lua_State* L)
 }
 
 /*
- * @returns whether jit.profile module is defined in lua state
+ * @returns whether jit is enabled
  */
 bool CScriptProfiler::luaIsJitProfilerDefined(lua_State* L)
 {
-    if (L == nullptr)
-    {
-        return false;
-    }
-
-    auto top = lua_gettop(L);
-
-    lua_getglobal(L, "require");
-    lua_pushstring(L, "jit.profile");
-
-    if (lua_pcall(L, 1, 0, 0) == LUA_OK)
-    {
-		R_ASSERT2(top == lua_gettop(L), "Lua VM stack should not be affected by jit.profile check");
-     	return true;
-    }
-    else
-    {
-        // Remove error message to keep stack in previous state.
-    	lua_pop(L, 1);
-
-        R_ASSERT2(top == lua_gettop(L), "Lua VM stack should not be affected by jit.profile check");
-    	return true;
-    }
+    // Safest and least invasive way to check it.
+    // Other methods affect lua stack and may add interfere with VS extensions / other hooks / error callbacks.
+    // We assume that we do not load JIT libs only if nojit parameter is provided.
+    return !strstr(Core.Params, CScriptEngine::ARGUMENT_ENGINE_NOJIT);
 }
 
 /**

diff --git a/src/xrScriptEngine/script_profiler.hpp b/src/xrScriptEngine/script_profiler.hpp
@@ -76,6 +76,7 @@ class XRSCRIPTENGINE_API CScriptProfiler
     using Duration = Clock::duration;
 
 private:
+    // todo: Can we make some global module to store all the arguments as experessions?
     // List of commnad line args for startup profuler attach:
     constexpr static cpcstr ARGUMENT_PROFILER_DEFAULT = "-lua_profiler";
     constexpr static cpcstr ARGUMENT_PROFILER_HOOK = "-lua_hook_profiler";