ModdingRX/YimMenu
Archived
1
0
Fork 0
Code Actions Releases Activity

fix(lua) (#1697)

Browse Source 
- sandbox stuff.
- Fix lua scripts that could run when their lua state was destroyed, causing chaos.
This commit is contained in:
Quentin
2023-07-13 09:36:13 +02:00
committed by GitHub
parent f09b1cbda3
commit f26514f8e4
5 changed files with 174 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

98
src/lua/bindings/script.hpp
View File

@ -20,12 +20,20 @@ namespace lua::script
// Class: script_util
// Name: yield
// Yield execution.
int yield()
{
return 0;
}
// Lua API: Function
// Class: script_util
// Name: sleep
// Param: ms: integer: The amount of time in milliseconds that we will sleep for.
// Sleep for the given amount of time, time is in milliseconds.
int sleep(int ms)
{
return ms;
}
};
static script_util dummy_script_util;
@ -62,12 +70,16 @@ namespace lua::script
// ENTITY.DELETE_ENTITY(spawnedVehicle)
// end)
// ```
static void register_looped(const std::string& name, sol::coroutine func, sol::this_state state)
static void register_looped(const std::string& name, sol::function func_, sol::this_state state)
{
auto module = sol::state_view(state)["!this"].get<big::lua_module*>();
module->m_registered_scripts.push_back(big::g_script_mgr.add_script(std::make_unique<big::script>(
[func] () mutable {
std::unique_ptr<big::script> lua_script = std::make_unique<big::script>(
[func_, state]() mutable {
sol::thread t = sol::thread::create(state);
sol::coroutine func = sol::coroutine(t.state(), func_);
while (big::g_running)
{
auto res = func(dummy_script_util);
@ -75,17 +87,22 @@ namespace lua::script
if (!res.valid())
big::g_lua_manager->handle_error(res, res.lua_state());
if (func.runnable())
{
if (func.runnable())
{
big::script::get_current()->yield(std::chrono::milliseconds(res.return_count() ? res[0] : 0));
}
else
{
}
else
{
big::script::get_current()->yield();
}
}
}
},
name)));
name
);
const auto registered_script = big::g_script_mgr.add_script(std::move(lua_script));
module->m_registered_scripts.push_back(registered_script);
}
// Lua API: Function
@ -116,28 +133,42 @@ namespace lua::script
// ENTITY.DELETE_ENTITY(spawnedVehicle)
// end)
// ```
static void run_in_fiber(sol::coroutine func)
static void run_in_fiber(sol::function func_, sol::this_state state)
{
big::g_fiber_pool->queue_job([func] () mutable {
while (big::g_running)
{
auto res = func(dummy_script_util);
auto module = sol::state_view(state)["!this"].get<big::lua_module*>();
if (!res.valid())
big::g_lua_manager->handle_error(res, res.lua_state());
static size_t name_i = 0;
std::string job_name = module->module_name() + std::to_string(name_i++);
// Still runnable, meaning that the user function yielded
// and that there is more code to run still.
if (func.runnable())
{
big::script::get_current()->yield(std::chrono::milliseconds(res.return_count() ? res[0] : 0));
}
else
{
break;
}
}
});
// We make a new script for lua state destruction timing purposes, see lua_module dctor for more info.
std::unique_ptr<big::script> lua_script = std::make_unique<big::script>(
[func_, state]() mutable {
sol::thread t = sol::thread::create(state);
sol::coroutine func = sol::coroutine(t.state(), func_);
while (big::g_running)
{
auto res = func(dummy_script_util);
if (!res.valid())
big::g_lua_manager->handle_error(res, res.lua_state());
if (func.runnable())
{
big::script::get_current()->yield(std::chrono::milliseconds(res.return_count() ? res[0] : 0));
}
else
{
big::g_script_mgr.remove_script(big::script::get_current());
break;
}
}
},
job_name);
const auto registered_script = big::g_script_mgr.add_script(std::move(lua_script));
module->m_registered_scripts.push_back(registered_script);
}
static void bind(sol::state& state)
@ -146,12 +177,9 @@ namespace lua::script
ns["register_looped"] = register_looped;
ns["run_in_fiber"] = run_in_fiber;
sol::function lua_coroutine_yield = state["coroutine"]["yield"];
state.new_usertype<script_util>("script_util");
//clang-format off
state.new_usertype<script_util>("script_util",
"yield", lua_coroutine_yield,
"sleep", lua_coroutine_yield);
//clang-format on
state["script_util"]["yield"] = sol::yielding(&script_util::yield);
state["script_util"]["sleep"] = sol::yielding(&script_util::sleep);
}
}