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

Merge branch 'thread_scheduler' of gitlab.istic.univ-rennes1.fr:simpleos/burritos into thread_scheduler

Browse Source
This commit is contained in:
François Autin 2023-03-22 16:22:28 +01:00
commit 6edb88f337
No known key found for this signature in database
GPG Key ID: 343F5D382E1DD77C
2 changed files with 27 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/kernel/synch.rs
View File

@ -67,8 +67,9 @@ impl Semaphore {
pub fn v(&mut self, machine: &mut Machine, thread_manager: &mut ThreadManager){ pub fn v(&mut self, machine: &mut Machine, thread_manager: &mut ThreadManager){
let old_status = machine.interrupt.set_status(InterruptOff); let old_status = machine.interrupt.set_status(InterruptOff);
self.counter += 1; self.counter += 1;
if self.waiting_queue.peek() != None { match self.waiting_queue.pop() {
thread_manager.ready_to_run(self.waiting_queue.pop().unwrap()); Some(thread) => thread_manager.ready_to_run(thread),
None => ()
} }
machine.interrupt.set_status(old_status); machine.interrupt.set_status(old_status);
} }
@ -149,15 +150,18 @@ impl Lock {
match thread_manager.get_g_current_thread() { match thread_manager.get_g_current_thread() {
Some(_) => { Some(_) => {
if self.held_by_current_thread(thread_manager) { if self.held_by_current_thread(thread_manager) {
if self.waiting_queue.peek().is_none() { match self.waiting_queue.pop() {
self.owner = Some(self.waiting_queue.pop().unwrap()); Some(thread) => {
match &self.owner { self.owner = Some(thread);
Some(x) => thread_manager.ready_to_run(Rc::clone(x)), match &self.owner {
None => () Some(x) => thread_manager.ready_to_run(Rc::clone(&x)),
None => ()
}
},
None => {
self.free = true;
self.owner = None;
} }
} else {
self.free = true;
self.owner = None;
} }
} }
} }
@ -229,8 +233,9 @@ impl Condition {
pub fn signal(&mut self, machine: &mut Machine, thread_manager: &mut ThreadManager) { pub fn signal(&mut self, machine: &mut Machine, thread_manager: &mut ThreadManager) {
let old_status = machine.interrupt.set_status(InterruptOff); let old_status = machine.interrupt.set_status(InterruptOff);
if self.waiting_queue.peek().is_none() { match self.waiting_queue.pop() {
thread_manager.ready_to_run(self.waiting_queue.pop().unwrap()); Some(thread) => thread_manager.ready_to_run(thread),
None => ()
} }
machine.interrupt.set_status(old_status); machine.interrupt.set_status(old_status);
@ -246,8 +251,9 @@ impl Condition {
pub fn broadcast(&mut self, machine: &mut Machine, thread_manager: &mut ThreadManager) { pub fn broadcast(&mut self, machine: &mut Machine, thread_manager: &mut ThreadManager) {
let old_status = machine.interrupt.set_status(InterruptOff); let old_status = machine.interrupt.set_status(InterruptOff);
while self.waiting_queue.peek().is_none() { match self.waiting_queue.pop() {
thread_manager.ready_to_run(self.waiting_queue.pop().unwrap()); Some(thread) => thread_manager.ready_to_run(thread),
None => ()
} }
machine.interrupt.set_status(old_status); machine.interrupt.set_status(old_status);

7
src/kernel/thread_manager.rs
View File

@ -189,4 +189,11 @@ impl ThreadManager {
self.g_thread_to_be_destroyed = thread self.g_thread_to_be_destroyed = thread
} }
}
#[cfg(test)]
mod test {
} }