lune-org/lune
1
1
Fork 0
mirror of https://github.com/lune-org/lune.git synced 2024-12-12 13:00:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Properly remove task-spawned threads from registry after use

Browse source
This commit is contained in:
Filip Tibell 2023-01-24 12:10:43 -05:00
parent cb9aa1fc1b
commit 371892fc7d
No known key found for this signature in database
1 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/lib/globals/task.rs
View file

@ -53,7 +53,10 @@ async fn task_cancel<'a>(lua: &'a Lua, thread: LuaThread<'a>) -> LuaResult<()> {
Ok(()) Ok(())
} }
async fn task_defer<'a>(lua: &'a Lua, tof: LuaValue<'a>) -> LuaResult<LuaThread<'a>> { async fn task_defer<'a>(
lua: &'a Lua,
(tof, _args): (LuaValue<'a>, LuaMultiValue<'a>),
) -> LuaResult<LuaThread<'a>> {
// Spawn a new detached task using a lua reference that we can use inside of our task // Spawn a new detached task using a lua reference that we can use inside of our task
let task_lua = lua.app_data_ref::<Weak<Lua>>().unwrap().upgrade().unwrap(); let task_lua = lua.app_data_ref::<Weak<Lua>>().unwrap().upgrade().unwrap();
let task_thread = tof_to_thread(lua, tof)?; let task_thread = tof_to_thread(lua, tof)?;
@ -64,6 +67,7 @@ async fn task_defer<'a>(lua: &'a Lua, tof: LuaValue<'a>) -> LuaResult<LuaThread<
if thread.status() == LuaThreadStatus::Resumable { if thread.status() == LuaThreadStatus::Resumable {
thread.into_async::<_, LuaMultiValue>(()).await?; thread.into_async::<_, LuaMultiValue>(()).await?;
} }
task_lua.remove_registry_value(task_thread_key)?;
Ok(()) Ok(())
}) })
.await?; .await?;
@ -72,7 +76,7 @@ async fn task_defer<'a>(lua: &'a Lua, tof: LuaValue<'a>) -> LuaResult<LuaThread<
async fn task_delay<'a>( async fn task_delay<'a>(
lua: &'a Lua, lua: &'a Lua,
(duration, tof): (Option<f32>, LuaValue<'a>), (duration, tof, _args): (Option<f32>, LuaValue<'a>, LuaMultiValue<'a>),
) -> LuaResult<LuaThread<'a>> { ) -> LuaResult<LuaThread<'a>> {
// Spawn a new detached task using a lua reference that we can use inside of our task // Spawn a new detached task using a lua reference that we can use inside of our task
let task_lua = lua.app_data_ref::<Weak<Lua>>().unwrap().upgrade().unwrap(); let task_lua = lua.app_data_ref::<Weak<Lua>>().unwrap().upgrade().unwrap();
@ -85,13 +89,17 @@ async fn task_delay<'a>(
if thread.status() == LuaThreadStatus::Resumable { if thread.status() == LuaThreadStatus::Resumable {
thread.into_async::<_, LuaMultiValue>(()).await?; thread.into_async::<_, LuaMultiValue>(()).await?;
} }
task_lua.remove_registry_value(task_thread_key)?;
Ok(()) Ok(())
}) })
.await?; .await?;
Ok(lua_thread_to_return) Ok(lua_thread_to_return)
} }
async fn task_spawn<'a>(lua: &'a Lua, tof: LuaValue<'a>) -> LuaResult<LuaThread<'a>> { async fn task_spawn<'a>(
lua: &'a Lua,
(tof, _args): (LuaValue<'a>, LuaMultiValue<'a>),
) -> LuaResult<LuaThread<'a>> {
// Spawn a new detached task using a lua reference that we can use inside of our task // Spawn a new detached task using a lua reference that we can use inside of our task
let task_lua = lua.app_data_ref::<Weak<Lua>>().unwrap().upgrade().unwrap(); let task_lua = lua.app_data_ref::<Weak<Lua>>().unwrap().upgrade().unwrap();
let task_thread = tof_to_thread(lua, tof)?; let task_thread = tof_to_thread(lua, tof)?;
@ -102,6 +110,7 @@ async fn task_spawn<'a>(lua: &'a Lua, tof: LuaValue<'a>) -> LuaResult<LuaThread<
if thread.status() == LuaThreadStatus::Resumable { if thread.status() == LuaThreadStatus::Resumable {
thread.into_async::<_, LuaMultiValue>(()).await?; thread.into_async::<_, LuaMultiValue>(()).await?;
} }
task_lua.remove_registry_value(task_thread_key)?;
Ok(()) Ok(())
}) })
.await?; .await?;