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

fix the scheduler running forever on specific async tasks

Browse source
This commit is contained in:
bjcscat 2024-07-16 10:26:21 -05:00
parent bc0e8773d2
commit df4ba68caf
1 changed files with 21 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
crates/mlua-luau-scheduler/src/scheduler.rs
View file

@ -8,7 +8,7 @@ use std::{
thread::panicking, thread::panicking,
}; };
use futures_lite::prelude::*; use futures_lite::{future::yield_now, prelude::*};
use mlua::prelude::*; use mlua::prelude::*;
use async_executor::{Executor, LocalExecutor}; use async_executor::{Executor, LocalExecutor};
@ -369,23 +369,28 @@ impl<'lua> Scheduler<'lua> {
// 5 // 5
let mut num_processed = 0; let mut num_processed = 0;
let span_tick = trace_span!("Scheduler::tick"); // let span_tick = trace_span!("Scheduler::tick");
let fut_tick = async { // let fut_tick = async {
local_exec.tick().await; // local_exec.tick().await;
// NOTE: Try to do as much work as possible instead of just a single tick() // // NOTE: Try to do as much work as possible instead of just a single tick()
num_processed += 1; // num_processed += 1;
while local_exec.try_tick() { // while local_exec.try_tick() {
num_processed += 1; // num_processed += 1;
} // }
}; // };
local_exec
.run(
fut_exit.or(fut_spawn).or(fut_defer).or(fut_futs).or(async {
local_exec.tick().await; // weird but is required to preserve scheduler ordering
if !local_exec.is_empty() {
yield_now().await;
}
}), // .or(fut_tick.instrument(span_tick.or_current())),
)
.await;
// 1 + 2 + 3 + 4 + 5 // 1 + 2 + 3 + 4 + 5
fut_exit
.or(fut_spawn)
.or(fut_defer)
.or(fut_futs)
.or(fut_tick.instrument(span_tick.or_current()))
.await;
// Check if we should exit // Check if we should exit
if self.exit.get().is_some() { if self.exit.get().is_some() {