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

Minor runner improvements

Browse source
This commit is contained in:
Filip Tibell 2023-01-23 02:47:06 -05:00
parent 19829d7cf4
commit 5839a7b021
No known key found for this signature in database
1 changed files with 27 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
src/lib/lib.rs
View file

@ -1,4 +1,10 @@
use std::{collections::HashSet, sync::Arc};
use std::{
collections::HashSet,
sync::{
atomic::{AtomicU32, Ordering},
Arc,
},
};
use anyhow::{anyhow, bail, Result};
use mlua::prelude::*;
@ -9,9 +15,12 @@ pub mod utils;
use crate::{
globals::{create_console, create_fs, create_net, create_process, create_task},
utils::formatting::{format_label, pretty_format_luau_error},
utils::formatting::pretty_format_luau_error,
};
#[cfg(not(test))]
use crate::utils::formatting::format_label;
#[derive(Clone, Debug, PartialEq, Eq, Hash)]
pub enum LuneGlobal {
Console,
@ -101,42 +110,35 @@ impl Lune {
.await;
let message = match result {
Ok(_) => LuneMessage::Finished,
Err(e) => LuneMessage::Error(if cfg!(test) {
anyhow!("{}", pretty_format_luau_error(&e))
} else {
anyhow!(
"\n{}\n{}",
format_label("ERROR"),
pretty_format_luau_error(&e)
)
}),
#[cfg(test)]
Err(e) => LuneMessage::Error(anyhow!("{}", pretty_format_luau_error(&e))),
#[cfg(not(test))]
Err(e) => LuneMessage::Error(anyhow!(
"\n{}\n{}",
format_label("ERROR"),
pretty_format_luau_error(&e)
)),
};
sender.send(message).await
})
.detach();
// Run the executor until there are no tasks left
let mut task_count = 1;
let task_count = AtomicU32::new(0);
smol::block_on(exec.run(async {
while let Ok(message) = receiver.recv().await {
match message {
LuneMessage::Spawned => {
task_count += 1;
}
LuneMessage::Finished => {
task_count -= 1;
if task_count <= 0 {
break;
}
}
let value = match message {
LuneMessage::Spawned => task_count.fetch_add(1, Ordering::Relaxed),
LuneMessage::Finished => task_count.fetch_sub(1, Ordering::Relaxed),
LuneMessage::Error(e) => {
task_count -= 1;
task_count.fetch_sub(1, Ordering::Relaxed);
bail!("{}", e)
}
LuneMessage::LuaError(e) => {
task_count -= 1;
task_count.fetch_sub(1, Ordering::Relaxed);
bail!("{}", e)
}
}
};
println!("Running tasks: {value}");
}
Ok(())
}))