Move scheduling functionality into task; add Scheduler policy tra…

…it (#1035) * Add the `Scheduler` trait, which represents a scheduler policy. * By default, there is one instance of a `Scheduler` policy per CPU. * Support dynamically registering and switching between different scheduler policies on a per-CPU basis. * Because this is now defined in the `task` crate instead of in the `scheduler` crate, the `task` crate can now access all functionality provided by a scheduler policy, which allows for custom actions like setting priority or removing/adding blocked/unblocked tasks to/from a runqueue. * Combine `runqueue_*` crates with their respective and `scheduler_*` crates, which is an improved design because external crates should not be able to view or modify a scheduler policy's internal runqueue contents. * This design makes sense, and also prevents issues like #1000. * Modify most applications that access runqueues via the old `runqueue_*` crate APIs to go through the new `Scheduler` API instead. ---------- Signed-off-by: Klimenty Tsoutsman <[email protected]> Co-authored-by: Kevin Boos <[email protected]>
theseus-os · Oct 3, 2023 · 810e12f · 810e12f
1 parent 0bd4447
commit 810e12f
Show file tree

Hide file tree

Showing 45 changed files with 776 additions and 1,717 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/applications/bm/Cargo.toml b/applications/bm/Cargo.toml
@@ -33,9 +33,6 @@ path = "../../kernel/spawn"
 [dependencies.path]
 path = "../../kernel/path"
 
-[dependencies.runqueue]
-path = "../../kernel/runqueue"
-
 [dependencies.heapfile]
 path = "../../kernel/heapfile"
 # [dependencies.application_main_fn]

diff --git a/applications/bm/src/lib.rs b/applications/bm/src/lib.rs
@@ -18,7 +18,6 @@ extern crate apic;
 extern crate cpu;
 extern crate spawn;
 extern crate path;
-extern crate runqueue;
 extern crate heapfile;
 extern crate scheduler;
 extern crate libtest;

diff --git a/applications/heap_eval/Cargo.toml b/applications/heap_eval/Cargo.toml
@@ -23,9 +23,6 @@ path = "../../kernel/apic"
 [dependencies.cpu]
 path = "../../kernel/cpu"
 
-[dependencies.runqueue]
-path = "../../kernel/runqueue"
-
 [dependencies.hashbrown]
 version = "0.11.2"
 features = ["nightly"]

diff --git a/applications/heap_eval/src/lib.rs b/applications/heap_eval/src/lib.rs
@@ -7,7 +7,6 @@ extern crate hpet;
 extern crate hashbrown;
 extern crate qp_trie;
 extern crate apic;
-extern crate runqueue;
 extern crate libtest;
 extern crate spawn;
 extern crate cpu;

diff --git a/applications/kill/Cargo.toml b/applications/kill/Cargo.toml
@@ -15,8 +15,5 @@ path = "../../kernel/app_io"
 [dependencies.task]
 path = "../../kernel/task"
 
-[dependencies.runqueue]
-path = "../../kernel/runqueue"
-
 # [dependencies.application_main_fn]
 # path = "../../compiler_plugins"
diff --git a/applications/kill/src/lib.rs b/applications/kill/src/lib.rs
@@ -4,7 +4,6 @@ extern crate alloc;
 // #[macro_use] extern crate debugit;
 
 extern crate task;
-extern crate runqueue;
 extern crate getopts;
 
 use getopts::Options;

diff --git a/applications/ps/src/lib.rs b/applications/ps/src/lib.rs
@@ -60,7 +60,7 @@ pub fn main(args: Vec<String>) -> isize {
                 else {" "} ;
 
             #[cfg(any(epoch_scheduler, priority_scheduler))] {
-                let priority = scheduler::get_priority(&task).map(|priority| format!("{}", priority)).unwrap_or_else(|| String::from("-"));
+                let priority = scheduler::priority(&task).map(|priority| format!("{}", priority)).unwrap_or_else(|| String::from("-"));
                 task_string.push_str(
                     &format!("{0:<5}  {1:<10}  {2:<4}  {3:<4}  {4:<5}  {5:<10}  {6}\n", 
                     id, runstate, cpu, pinned, task_type, priority, task.name)

diff --git a/applications/rq/Cargo.toml b/applications/rq/Cargo.toml
@@ -2,21 +2,19 @@
 name = "rq"
 version = "0.1.0"
 authors = ["Christine Wang <[email protected]>"]
+edition = "2021"
 
 [dependencies]
 getopts = "0.2.21"
 
 [dependencies.app_io]
 path = "../../kernel/app_io"
 
-[dependencies.apic]
-path = "../../kernel/apic"
+[dependencies.cpu]
+path = "../../kernel/cpu"
 
 [dependencies.task]
 path = "../../kernel/task"
 
-[dependencies.runqueue]
-path = "../../kernel/runqueue"
-
 # [dependencies.application_main_fn]
 # path = "../../compiler_plugins"