From f2bd9ddf4d9db34808633b63b69ada21b9c4cd15 Mon Sep 17 00:00:00 2001
From: Erin <erin@erindesu.cz>
Date: Tue, 9 Aug 2022 01:32:42 +0200
Subject: [PATCH] Added spawner

---
 Cargo.lock         |   1 +
 kernel/Cargo.toml  |   1 +
 kernel/src/task.rs | 100 ++++++++++++++++++++++++++++++++++-----------
 3 files changed, 79 insertions(+), 23 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 1d30499..d6861c6 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -318,6 +318,7 @@ dependencies = [
  "linked_list_allocator",
  "log",
  "slab",
+ "spin 0.9.4",
  "versioning",
 ]
 
diff --git a/kernel/Cargo.toml b/kernel/Cargo.toml
index d2c0d1c..7d56e3d 100644
--- a/kernel/Cargo.toml
+++ b/kernel/Cargo.toml
@@ -7,6 +7,7 @@ version = "0.1.2"
 linked_list_allocator = "0.9"
 log = "0.4.14"
 slab = { version = "0.4", default-features = false }
+spin = "0.9"
 
 [dependencies.crossbeam-queue]
 version = "0.3"
diff --git a/kernel/src/task.rs b/kernel/src/task.rs
index 39f26d1..5bf4eb1 100644
--- a/kernel/src/task.rs
+++ b/kernel/src/task.rs
@@ -8,8 +8,40 @@ use core::{
 };
 use crossbeam_queue::SegQueue;
 use slab::Slab;
+use spin::RwLock;
 
 type TaskQueue = Arc<SegQueue<TaskId>>;
+type SpawnQueue = Arc<SegQueue<Task>>;
+
+static SPAWN_QUEUE: RwLock<Option<SpawnQueue>> = RwLock::new(None);
+
+/// Spawn a new task
+pub fn spawn(future: impl Future<Output = ()> + Send + 'static) {
+    match &*SPAWN_QUEUE.read() {
+        Some(s) => s.push(Task::new(future)),
+        None => panic!("no task executor is running"),
+    }
+}
+
+/// Forcibly yield a task
+pub fn yield_now() -> impl Future<Output = ()> {
+    struct YieldNow(bool);
+    impl Future for YieldNow {
+        type Output = ();
+
+        fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
+            if self.0 {
+                Poll::Ready(())
+            } else {
+                self.0 = true;
+                cx.waker().wake_by_ref();
+                Poll::Pending
+            }
+        }
+    }
+
+    YieldNow(false)
+}
 
 /// Tasks executor
 #[derive(Default)]
@@ -20,41 +52,63 @@ pub struct Executor {
     /// Awake tasks' queue
     queue: TaskQueue,
 
+    /// Incoming tasks to enqueue
+    incoming: SpawnQueue,
+
     /// Wakers
     wakers: BTreeMap<TaskId, Waker>,
 }
 
 impl Executor {
-    /// Spawn a future
-    pub fn spawn(&mut self, future: impl Future<Output = ()> + 'static) {
+    /// Spawn a task
+    pub fn spawn(&mut self, future: impl Future<Output = ()> + Send + 'static) {
         self.queue
             .push(TaskId(self.tasks.insert(Task::new(future))));
     }
 
-    /// Run tasks
-    pub fn run(&mut self) -> ! {
-        loop {
-            while let Some(id) = self.queue.pop() {
-                let task = match self.tasks.get_mut(id.0) {
-                    Some(t) => t,
-                    None => continue,
-                };
+    /// Spin poll loop until it runs out of tasks
+    pub fn run(&mut self) {
+        // Assign `self.incoming` to global spawn queue to spawn tasks
+        // from within
+        {
+            let mut spawner = SPAWN_QUEUE.write();
+            if spawner.is_some() {
+                panic!("task executor is already running");
+            }
 
-                let mut cx = Context::from_waker(
-                    self.wakers
-                        .entry(id)
-                        .or_insert_with(|| TaskWaker::new(id, Arc::clone(&self.queue))),
-                );
+            *spawner = Some(Arc::clone(&self.incoming));
+        }
 
-                match task.poll(&mut cx) {
-                    Poll::Ready(()) => {
-                        self.tasks.remove(id.0);
-                        self.wakers.remove(&id);
-                    }
-                    Poll::Pending => (),
+        // Try to get incoming task, if none available, poll
+        // enqueued one
+        while let Some(id) = self
+            .incoming
+            .pop()
+            .map(|t| TaskId(self.tasks.insert(t)))
+            .or_else(|| self.queue.pop())
+        {
+            let task = match self.tasks.get_mut(id.0) {
+                Some(t) => t,
+                None => panic!("attempted to get non-extant task with id {}", id.0),
+            };
+
+            let mut cx = Context::from_waker(
+                self.wakers
+                    .entry(id)
+                    .or_insert_with(|| TaskWaker::new(id, Arc::clone(&self.queue))),
+            );
+
+            match task.poll(&mut cx) {
+                Poll::Ready(()) => {
+                    // Task done, unregister
+                    self.tasks.remove(id.0);
+                    self.wakers.remove(&id);
                 }
+                Poll::Pending => (),
             }
         }
+
+        *SPAWN_QUEUE.write() = None;
     }
 }
 
@@ -63,12 +117,12 @@ struct TaskId(usize);
 
 /// Async task
 struct Task {
-    future: Pin<Box<dyn Future<Output = ()>>>,
+    future: Pin<Box<dyn Future<Output = ()> + Send>>,
 }
 
 impl Task {
     /// Create a new task from a future
-    fn new(future: impl Future<Output = ()> + 'static) -> Self {
+    fn new(future: impl Future<Output = ()> + Send + 'static) -> Self {
         Self {
             future: Box::pin(future),
         }