mirror of
https://github.com/CompeyDev/lune-packaging.git
synced 2025-01-09 12:19:09 +00:00
Clean up boilerplate in task lib implementation
This commit is contained in:
Filip Tibell
parent
f2c9213e3e
commit
eea1e65c07
1 changed files with 107 additions and 141 deletions
|
|
@ -6,6 +6,7 @@ use std::{
|
||||||
};
|
};
|
||||||
|
|
||||||
use mlua::prelude::*;
|
use mlua::prelude::*;
|
||||||
|
use smol::prelude::*;
|
||||||
use smol::{channel::Sender, LocalExecutor, Timer};
|
use smol::{channel::Sender, LocalExecutor, Timer};
|
||||||
|
|
||||||
use crate::{utils::table_builder::TableBuilder, LuneMessage};
|
use crate::{utils::table_builder::TableBuilder, LuneMessage};
|
||||||
|
|
@ -34,6 +35,49 @@ fn tof_to_thread<'a>(lua: &'a Lua, tof: LuaValue<'a>) -> LuaResult<LuaThread<'a>
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async fn run_registered_task(
|
||||||
|
lua: &Lua,
|
||||||
|
to_run: impl Future<Output = LuaResult<()>> + 'static,
|
||||||
|
run_in_background: bool,
|
||||||
|
) -> LuaResult<()> {
|
||||||
|
// Fetch global references to task executor & message sender
|
||||||
|
let exec = lua
|
||||||
|
.app_data_ref::<Weak<LocalExecutor>>()
|
||||||
|
.unwrap()
|
||||||
|
.upgrade()
|
||||||
|
.unwrap();
|
||||||
|
let sender = lua
|
||||||
|
.app_data_ref::<Weak<Sender<LuneMessage>>>()
|
||||||
|
.unwrap()
|
||||||
|
.upgrade()
|
||||||
|
.unwrap();
|
||||||
|
// Send a message that we have started our task
|
||||||
|
sender
|
||||||
|
.send(LuneMessage::Spawned)
|
||||||
|
.await
|
||||||
|
.map_err(LuaError::external)?;
|
||||||
|
// Run the new task separately from the current one using the executor
|
||||||
|
// FIXME: This should run the task instantly and only stop at the first yield
|
||||||
|
let sender = sender.clone();
|
||||||
|
let task = exec.spawn(async move {
|
||||||
|
sender
|
||||||
|
.send(match to_run.await {
|
||||||
|
Ok(_) => LuneMessage::Finished,
|
||||||
|
Err(e) => LuneMessage::LuaError(e),
|
||||||
|
})
|
||||||
|
.await
|
||||||
|
});
|
||||||
|
// Wait for the task to complete OR let it run in the background
|
||||||
|
// Any lua errors will be sent through the message channel back
|
||||||
|
// to the main thread which will then handle them properly
|
||||||
|
if run_in_background {
|
||||||
|
task.detach();
|
||||||
|
Ok(())
|
||||||
|
} else {
|
||||||
|
task.await.map_err(LuaError::external)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
async fn task_cancel<'a>(lua: &'a Lua, thread: LuaThread<'a>) -> LuaResult<()> {
|
async fn task_cancel<'a>(lua: &'a Lua, thread: LuaThread<'a>) -> LuaResult<()> {
|
||||||
let coroutine: LuaTable = lua.globals().raw_get("coroutine")?;
|
let coroutine: LuaTable = lua.globals().raw_get("coroutine")?;
|
||||||
let close: LuaFunction = coroutine.raw_get("close")?;
|
let close: LuaFunction = coroutine.raw_get("close")?;
|
||||||
|
|
@ -41,168 +85,90 @@ async fn task_cancel<'a>(lua: &'a Lua, thread: LuaThread<'a>) -> LuaResult<()> {
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
async fn task_defer<'a>(task_lua: &'a Lua, tof: LuaValue<'a>) -> LuaResult<LuaThread<'a>> {
|
async fn task_defer<'a>(lua: &'a Lua, tof: LuaValue<'a>) -> LuaResult<LuaThread<'a>> {
|
||||||
// Boilerplate to get arc-ed lua & async executor
|
// Spawn a new detached task using a lua reference that we can use inside of our task
|
||||||
let lua = task_lua
|
let task_lua = lua.app_data_ref::<Weak<Lua>>().unwrap().upgrade().unwrap();
|
||||||
.app_data_ref::<Weak<Lua>>()
|
let task_thread = tof_to_thread(lua, tof)?;
|
||||||
.unwrap()
|
let task_thread_key = lua.create_registry_value(task_thread)?;
|
||||||
.upgrade()
|
let lua_thread_to_return = lua.registry_value(&task_thread_key)?;
|
||||||
.unwrap();
|
run_registered_task(
|
||||||
let exec = task_lua
|
lua,
|
||||||
.app_data_ref::<Weak<LocalExecutor>>()
|
async move {
|
||||||
.unwrap()
|
task_wait(&task_lua, None).await?;
|
||||||
.upgrade()
|
let thread = task_lua.registry_value::<LuaThread>(&task_thread_key)?;
|
||||||
.unwrap();
|
|
||||||
let sender = task_lua
|
|
||||||
.app_data_ref::<Weak<Sender<LuneMessage>>>()
|
|
||||||
.unwrap()
|
|
||||||
.upgrade()
|
|
||||||
.unwrap();
|
|
||||||
// Spawn a new detached thread
|
|
||||||
sender
|
|
||||||
.send(LuneMessage::Spawned)
|
|
||||||
.await
|
|
||||||
.map_err(LuaError::external)?;
|
|
||||||
let thread = tof_to_thread(&lua, tof)?;
|
|
||||||
let thread_key = lua.create_registry_value(thread)?;
|
|
||||||
let thread_to_return = task_lua.registry_value(&thread_key)?;
|
|
||||||
let thread_sender = sender.clone();
|
|
||||||
exec.spawn(async move {
|
|
||||||
let result = async {
|
|
||||||
task_wait(&lua, None).await?;
|
|
||||||
let thread = lua.registry_value::<LuaThread>(&thread_key)?;
|
|
||||||
if thread.status() == LuaThreadStatus::Resumable {
|
if thread.status() == LuaThreadStatus::Resumable {
|
||||||
thread.into_async::<_, LuaMultiValue>(()).await?;
|
thread.into_async::<_, LuaMultiValue>(()).await?;
|
||||||
}
|
}
|
||||||
Ok::<_, LuaError>(())
|
Ok(())
|
||||||
};
|
},
|
||||||
thread_sender
|
true,
|
||||||
.send(match result.await {
|
)
|
||||||
Ok(_) => LuneMessage::Finished,
|
.await?;
|
||||||
Err(e) => LuneMessage::LuaError(e),
|
Ok(lua_thread_to_return)
|
||||||
})
|
|
||||||
.await
|
|
||||||
})
|
|
||||||
.detach();
|
|
||||||
Ok(thread_to_return)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
async fn task_delay<'a>(
|
async fn task_delay<'a>(
|
||||||
task_lua: &'a Lua,
|
lua: &'a Lua,
|
||||||
(duration, tof): (Option<f32>, LuaValue<'a>),
|
(duration, tof): (Option<f32>, LuaValue<'a>),
|
||||||
) -> LuaResult<LuaThread<'a>> {
|
) -> LuaResult<LuaThread<'a>> {
|
||||||
// Boilerplate to get arc-ed lua & async executor
|
// Spawn a new detached task using a lua reference that we can use inside of our task
|
||||||
let lua = task_lua
|
let task_lua = lua.app_data_ref::<Weak<Lua>>().unwrap().upgrade().unwrap();
|
||||||
.app_data_ref::<Weak<Lua>>()
|
let task_thread = tof_to_thread(lua, tof)?;
|
||||||
.unwrap()
|
let task_thread_key = lua.create_registry_value(task_thread)?;
|
||||||
.upgrade()
|
let lua_thread_to_return = lua.registry_value(&task_thread_key)?;
|
||||||
.unwrap();
|
run_registered_task(
|
||||||
let exec = task_lua
|
lua,
|
||||||
.app_data_ref::<Weak<LocalExecutor>>()
|
async move {
|
||||||
.unwrap()
|
task_wait(&task_lua, duration).await?;
|
||||||
.upgrade()
|
let thread = task_lua.registry_value::<LuaThread>(&task_thread_key)?;
|
||||||
.unwrap();
|
|
||||||
let sender = task_lua
|
|
||||||
.app_data_ref::<Weak<Sender<LuneMessage>>>()
|
|
||||||
.unwrap()
|
|
||||||
.upgrade()
|
|
||||||
.unwrap();
|
|
||||||
// Spawn a new detached thread
|
|
||||||
sender
|
|
||||||
.send(LuneMessage::Spawned)
|
|
||||||
.await
|
|
||||||
.map_err(LuaError::external)?;
|
|
||||||
let thread = tof_to_thread(&lua, tof)?;
|
|
||||||
let thread_key = lua.create_registry_value(thread)?;
|
|
||||||
let thread_to_return = task_lua.registry_value(&thread_key)?;
|
|
||||||
let thread_sender = sender.clone();
|
|
||||||
exec.spawn(async move {
|
|
||||||
let result = async {
|
|
||||||
task_wait(&lua, duration).await?;
|
|
||||||
let thread = lua.registry_value::<LuaThread>(&thread_key)?;
|
|
||||||
if thread.status() == LuaThreadStatus::Resumable {
|
if thread.status() == LuaThreadStatus::Resumable {
|
||||||
thread.into_async::<_, LuaMultiValue>(()).await?;
|
thread.into_async::<_, LuaMultiValue>(()).await?;
|
||||||
}
|
}
|
||||||
Ok::<_, LuaError>(())
|
Ok(())
|
||||||
};
|
},
|
||||||
thread_sender
|
true,
|
||||||
.send(match result.await {
|
)
|
||||||
Ok(_) => LuneMessage::Finished,
|
.await?;
|
||||||
Err(e) => LuneMessage::LuaError(e),
|
Ok(lua_thread_to_return)
|
||||||
})
|
|
||||||
.await
|
|
||||||
})
|
|
||||||
.detach();
|
|
||||||
Ok(thread_to_return)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
async fn task_spawn<'a>(task_lua: &'a Lua, tof: LuaValue<'a>) -> LuaResult<LuaThread<'a>> {
|
async fn task_spawn<'a>(lua: &'a Lua, tof: LuaValue<'a>) -> LuaResult<LuaThread<'a>> {
|
||||||
// Boilerplate to get arc-ed lua & async executor
|
// Spawn a new detached task using a lua reference that we can use inside of our task
|
||||||
let lua = task_lua
|
let task_lua = lua.app_data_ref::<Weak<Lua>>().unwrap().upgrade().unwrap();
|
||||||
.app_data_ref::<Weak<Lua>>()
|
let task_thread = tof_to_thread(lua, tof)?;
|
||||||
.unwrap()
|
let task_thread_key = lua.create_registry_value(task_thread)?;
|
||||||
.upgrade()
|
let lua_thread_to_return = lua.registry_value(&task_thread_key)?;
|
||||||
.unwrap();
|
run_registered_task(
|
||||||
let exec = task_lua
|
lua,
|
||||||
.app_data_ref::<Weak<LocalExecutor>>()
|
async move {
|
||||||
.unwrap()
|
let thread = task_lua.registry_value::<LuaThread>(&task_thread_key)?;
|
||||||
.upgrade()
|
|
||||||
.unwrap();
|
|
||||||
let sender = task_lua
|
|
||||||
.app_data_ref::<Weak<Sender<LuneMessage>>>()
|
|
||||||
.unwrap()
|
|
||||||
.upgrade()
|
|
||||||
.unwrap();
|
|
||||||
// Spawn a new detached thread
|
|
||||||
sender
|
|
||||||
.send(LuneMessage::Spawned)
|
|
||||||
.await
|
|
||||||
.map_err(LuaError::external)?;
|
|
||||||
let thread = tof_to_thread(&lua, tof)?;
|
|
||||||
let thread_key = lua.create_registry_value(thread)?;
|
|
||||||
let thread_to_return = task_lua.registry_value(&thread_key)?;
|
|
||||||
let thread_sender = sender.clone();
|
|
||||||
// FIXME: This does not run the thread instantly
|
|
||||||
exec.spawn(async move {
|
|
||||||
let result = async {
|
|
||||||
let thread = lua.registry_value::<LuaThread>(&thread_key)?;
|
|
||||||
if thread.status() == LuaThreadStatus::Resumable {
|
if thread.status() == LuaThreadStatus::Resumable {
|
||||||
thread.into_async::<_, LuaMultiValue>(()).await?;
|
thread.into_async::<_, LuaMultiValue>(()).await?;
|
||||||
}
|
}
|
||||||
Ok::<_, LuaError>(())
|
Ok(())
|
||||||
};
|
},
|
||||||
thread_sender
|
true,
|
||||||
.send(match result.await {
|
)
|
||||||
Ok(_) => LuneMessage::Finished,
|
.await?;
|
||||||
Err(e) => LuneMessage::LuaError(e),
|
Ok(lua_thread_to_return)
|
||||||
})
|
|
||||||
.await
|
|
||||||
})
|
|
||||||
.detach();
|
|
||||||
Ok(thread_to_return)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
async fn task_wait(lua: &Lua, duration: Option<f32>) -> LuaResult<f32> {
|
async fn task_wait(lua: &Lua, duration: Option<f32>) -> LuaResult<f32> {
|
||||||
let sender = lua
|
|
||||||
.app_data_ref::<Weak<Sender<LuneMessage>>>()
|
|
||||||
.unwrap()
|
|
||||||
.upgrade()
|
|
||||||
.unwrap();
|
|
||||||
sender
|
|
||||||
.send(LuneMessage::Spawned)
|
|
||||||
.await
|
|
||||||
.map_err(LuaError::external)?;
|
|
||||||
let start = Instant::now();
|
let start = Instant::now();
|
||||||
Timer::after(
|
run_registered_task(
|
||||||
duration
|
lua,
|
||||||
.map(Duration::from_secs_f32)
|
async move {
|
||||||
.unwrap_or(Duration::ZERO),
|
Timer::after(
|
||||||
|
duration
|
||||||
|
.map(Duration::from_secs_f32)
|
||||||
|
.unwrap_or(Duration::ZERO),
|
||||||
|
)
|
||||||
|
.await;
|
||||||
|
Ok(())
|
||||||
|
},
|
||||||
|
false,
|
||||||
)
|
)
|
||||||
.await;
|
.await?;
|
||||||
let end = Instant::now();
|
let end = Instant::now();
|
||||||
sender
|
|
||||||
.send(LuneMessage::Finished)
|
|
||||||
.await
|
|
||||||
.map_err(LuaError::external)?;
|
|
||||||
Ok((end - start).as_secs_f32())
|
Ok((end - start).as_secs_f32())
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue