quentinlegot/burritos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'fix-nothing-to-run' into 'main'

Browse Source 
Fixed nobody to run

See merge request simpleos/burritos!19
This commit is contained in:
François Autin 2023-05-09 16:15:43 +00:00
commit c51bb694a5
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/kernel/thread_manager.rs
View File

@ -239,7 +239,11 @@ impl ThreadManager {
while next_thread.is_none() { while next_thread.is_none() {
eprintln!("Nobody to run => idle"); eprintln!("Nobody to run => idle");
machine.interrupt.idle(); machine.interrupt.idle();
next_thread = self.find_next_to_run(); if let Some(t) = self.find_next_to_run() {
next_thread = Some(t);
} else {
panic!("Couldn't find next thread to run.\nShutting down...");
}
} }
self.switch_to(machine, Rc::clone(&next_thread.unwrap())); self.switch_to(machine, Rc::clone(&next_thread.unwrap()));

10
test/riscv_instructions/boolean_logic/comparisons.c
View File

@ -1,15 +1,13 @@
int main() { int main() {
int x = 0; int x = 0;
int y = 1; int y = 1;
while (x <= y) {
if (x > y) { if (x > y) {
x += 1; x += 1;
} else if (x == y) { }
if (x == y) {
x += y; x += y;
} else if (x < y) { }
if (x < y) {
y += 1; y += 1;
} else {
return 0;
}
} }
} }