Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add Scheduler trait #1035

Merged
merged 31 commits into from Oct 3, 2023
Merged

Add Scheduler trait #1035

Show file tree
Hide file tree
Changes from 22 commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
c923d37
Temp
tsoutsman Sep 2, 2023
83fe1de
Works
tsoutsman Sep 2, 2023
2ddb077
Rename `scheduler_2` module to `scheduler`
tsoutsman Sep 4, 2023
972577a
Add draining functionality
tsoutsman Sep 4, 2023
ea4e592
Port epoch scheduler
tsoutsman Sep 4, 2023
be1688b
Port priority scheduler
tsoutsman Sep 4, 2023
41c7692
Fix build
tsoutsman Sep 5, 2023
425b96d
Save `rflags` during context switch
tsoutsman Sep 6, 2023
b5743c8
Merge branch 'save-rflags' of https://github.com/tsoutsman/Theseus in…
tsoutsman Sep 6, 2023
e6c8978
Merge branch 'theseus_main' into idle-task-in-cpu-local
tsoutsman Sep 8, 2023
4968af4
Fix all features build
tsoutsman Sep 8, 2023
5a5ce94
Remove `rq_access_eval`
tsoutsman Sep 8, 2023
0936352
Comments
tsoutsman Sep 8, 2023
8917875
Fix `scheduler_epoch` bug
tsoutsman Sep 8, 2023
618b5ce
Implement priority inheritance
tsoutsman Sep 8, 2023
cbe91ac
Port `rq`
tsoutsman Sep 8, 2023
7ffdfae
Cleanup `scheduler.rs`
tsoutsman Sep 8, 2023
414b31f
Final
tsoutsman Sep 8, 2023
cd2b49b
Clippy 😍
tsoutsman Sep 8, 2023
c420a74
Remove inner box
tsoutsman Sep 10, 2023
53882f8
Merge branch 'theseus_main' into idle-task-in-cpu-local
tsoutsman Sep 10, 2023
6d193f0
Merge branch 'theseus_main' into idle-task-in-cpu-local
tsoutsman Sep 15, 2023
3fbe863
Update kernel/scheduler_epoch/src/lib.rs
tsoutsman Oct 3, 2023
bd1843e
Don't check for idle tasks in epoch scheduler
tsoutsman Oct 3, 2023
9507231
Remove nonsensical comment
tsoutsman Oct 3, 2023
068f1fd
Rename dump
tsoutsman Oct 3, 2023
b51bb51
Use `update_guarded`
tsoutsman Oct 3, 2023
1bdeb39
Remove TODO
tsoutsman Oct 3, 2023
9b9807e
Merge branch 'theseus_main' into idle-task-in-cpu-local
tsoutsman Oct 3, 2023
d705903
cleanup epoch scheduler
kevinaboos Oct 3, 2023
ad9f300
minor cleanup
kevinaboos Oct 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
88 changes: 6 additions & 82 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 0 additions & 3 deletions applications/bm/Cargo.toml
View file
Open in desktop
Expand Up @@ -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]
Expand Down
1 change: 0 additions & 1 deletion applications/bm/src/lib.rs
View file
Open in desktop
Expand Up @@ -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;
Expand Down
3 changes: 0 additions & 3 deletions applications/heap_eval/Cargo.toml
View file
Open in desktop
Expand Up @@ -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"]
Expand Down
1 change: 0 additions & 1 deletion applications/heap_eval/src/lib.rs
View file
Open in desktop
Expand Up @@ -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;
Expand Down
3 changes: 0 additions & 3 deletions applications/kill/Cargo.toml
View file
Open in desktop
Expand Up @@ -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"
1 change: 0 additions & 1 deletion applications/kill/src/lib.rs
View file
Open in desktop
Expand Up @@ -4,7 +4,6 @@ extern crate alloc;
// #[macro_use] extern crate debugit;

extern crate task;
extern crate runqueue;
extern crate getopts;

use getopts::Options;
Expand Down
2 changes: 1 addition & 1 deletion applications/ps/src/lib.rs
View file
Open in desktop
Expand Up @@ -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)
Expand Down
8 changes: 3 additions & 5 deletions applications/rq/Cargo.toml
View file
Open in desktop
Expand Up @@ -2,21 +2,19 @@
name = "rq"
version = "0.1.0"
authors = ["Christine Wang <chrissywang54@gmail.com>"]
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"