chore: clean up scheduler code

This commit is contained in:
Jonathan Kelley committed 2022-11-09 10:58:11 -08:00
1 parent c096057dd3
commit f5bc137f01
17 files changed
+439 -294

No files matched your search

+23 -5
View File
@@ -7,15 +7,16 @@ use std::{
process::Output,
rc::Rc,
sync::Arc,
task::Poll,
};
use futures_task::{waker, ArcWake, Context, RawWaker, RawWakerVTable, Waker};
use futures_util::{pin_mut, Future, FutureExt};
use slab::Slab;
use std::task::{Context, RawWaker, RawWakerVTable, Waker};
use crate::{Element, ScopeId};
use super::{waker::RcWake, HandleInner, SchedulerHandle, SchedulerMsg};
use super::{waker::RcWake, HandleInner, Scheduler, SchedulerMsg};
#[cfg_attr(feature = "serialize", derive(serde::Serialize, serde::Deserialize))]
#[derive(Copy, Clone, PartialEq, Eq, Hash, Debug)]
@@ -24,12 +25,29 @@ pub struct TaskId(pub usize);
/// the task itself is the waker
pub struct LocalTask {
id: TaskId,
scope: ScopeId,
tx: futures_channel::mpsc::UnboundedSender<SchedulerMsg>,
pub id: TaskId,
pub scope: ScopeId,
pub tx: futures_channel::mpsc::UnboundedSender<SchedulerMsg>,
// todo: use rc and weak, or the bump slab instead of unsafecell
pub task: UnsafeCell<Pin<Box<dyn Future<Output = ()> + 'static>>>,
}
impl LocalTask {
pub fn progress(self: &Rc<Self>) -> bool {
let waker = self.waker();
let mut cx = Context::from_waker(&waker);
// safety: the waker owns its task and everythig is single threaded
let fut = unsafe { &mut *self.task.get() };
match fut.poll_unpin(&mut cx) {
Poll::Ready(_) => true,
_ => false,
}
}
}
impl HandleInner {
pub fn spawn(&self, scope: ScopeId, task: impl Future<Output = ()> + 'static) -> TaskId {
let mut tasks = self.tasks.borrow_mut();