lune-org/mlua-luau-scheduler
1
0
Fork 0
mirror of https://github.com/lune-org/mlua-luau-scheduler.git synced 2025-04-10 21:40:55 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix lua ext not yielding

Browse source
This commit is contained in:
Filip Tibell 2024-01-17 13:46:54 +01:00
parent a4599618de
commit dec5e940ed
No known key found for this signature in database
1 changed files with 37 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
src/lua_ext.rs
View file

@ -5,6 +5,11 @@ use tokio::{spawn, task::spawn_local};
use crate::{AsyncValues, Message, MessageSender, ThreadId}; use crate::{AsyncValues, Message, MessageSender, ThreadId};
const ASYNC_IMPL: &str = r#"
run(...)
return yield()
"#;
pub trait LuaAsyncExt<'lua> { pub trait LuaAsyncExt<'lua> {
fn current_thread_id(&'lua self) -> ThreadId; fn current_thread_id(&'lua self) -> ThreadId;
@ -37,7 +42,12 @@ impl<'lua> LuaAsyncExt<'lua> for Lua {
{ {
let tx = self.app_data_ref::<MessageSender>().unwrap().clone(); let tx = self.app_data_ref::<MessageSender>().unwrap().clone();
self.create_function(move |lua, args: A| { let yld = self
.globals()
.get::<_, LuaTable>("coroutine")?
.get::<_, LuaFunction>("yield")?;
let run = self.create_function(move |lua, args: A| {
let thread_id = lua.current_thread_id(); let thread_id = lua.current_thread_id();
let fut = f(lua, args); let fut = f(lua, args);
let tx = tx.clone(); let tx = tx.clone();
@ -50,7 +60,16 @@ impl<'lua> LuaAsyncExt<'lua> for Lua {
}); });
Ok(()) Ok(())
}) })?;
let env = self.create_table()?;
env.set("yield", yld)?;
env.set("run", run)?;
self.load(ASYNC_IMPL)
.set_environment(env)
.set_name("async")
.into_function()
} }
fn create_local_async_function<A, R, F, FR>(&'lua self, f: F) -> LuaResult<LuaFunction<'lua>> fn create_local_async_function<A, R, F, FR>(&'lua self, f: F) -> LuaResult<LuaFunction<'lua>>
@ -62,7 +81,12 @@ impl<'lua> LuaAsyncExt<'lua> for Lua {
{ {
let tx = self.app_data_ref::<MessageSender>().unwrap().clone(); let tx = self.app_data_ref::<MessageSender>().unwrap().clone();
self.create_function(move |lua, args: A| { let yld = self
.globals()
.get::<_, LuaTable>("coroutine")?
.get::<_, LuaFunction>("yield")?;
let run = self.create_function(move |lua, args: A| {
let thread_id = lua.current_thread_id(); let thread_id = lua.current_thread_id();
let fut = f(lua, args); let fut = f(lua, args);
let tx = tx.clone(); let tx = tx.clone();
@ -75,6 +99,15 @@ impl<'lua> LuaAsyncExt<'lua> for Lua {
}); });
Ok(()) Ok(())
}) })?;
let env = self.create_table()?;
env.set("yield", yld)?;
env.set("run", run)?;
self.load(ASYNC_IMPL)
.set_environment(env)
.set_name("async")
.into_function()
} }
} }