michaelkuc6/blog_os
1
0
Fork 0
mirror of https://github.com/phil-opp/blog_os.git synced 2025-12-17 06:47:49 +00:00
Code Issues Projects Releases Wiki Activity

Run cargo fmt

Browse Source
This commit is contained in:
Philipp Oppermann
2020-01-23 14:24:13 +01:00
parent cb7bb0ddef
commit 0caf5c351e
7 changed files with 80 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/multitasking/scheduler.rs
View File

@@ -1,7 +1,7 @@
use crate::multitasking::thread::{Thread, ThreadId};
use alloc::collections::{VecDeque, BTreeMap};
use x86_64::VirtAddr;
use alloc::collections::{BTreeMap, VecDeque};
use core::mem;
use x86_64::VirtAddr;
pub struct Scheduler {
threads: BTreeMap<ThreadId, Thread>,
@@ -14,7 +14,9 @@ impl Scheduler {
let root_thread = Thread::create_root_thread();
let root_id = root_thread.id();
let mut threads = BTreeMap::new();
threads.insert(root_id, root_thread).expect_none("map is not empty after creation");
threads
.insert(root_id, root_thread)
.expect_none("map is not empty after creation");
Scheduler {
threads,
current_thread_id: root_id,
@@ -28,8 +30,13 @@ impl Scheduler {
pub fn schedule(&mut self) -> Option<(ThreadId, VirtAddr)> {
if let Some(next_id) = self.next_thread() {
let next_thread = self.threads.get_mut(&next_id).expect("next thread does not exist");
let next_stack_pointer = next_thread.stack_pointer().take()
let next_thread = self
.threads
.get_mut(&next_id)
.expect("next thread does not exist");
let next_stack_pointer = next_thread
.stack_pointer()
.take()
.expect("paused thread has no stack pointer");
Some((next_id, next_stack_pointer))
} else {
@@ -37,21 +44,32 @@ impl Scheduler {
}
}
pub(super) fn add_paused_thread(&mut self, paused_stack_pointer: VirtAddr, next_thread_id: ThreadId) {
pub(super) fn add_paused_thread(
&mut self,
paused_stack_pointer: VirtAddr,
next_thread_id: ThreadId,
) {
let paused_thread_id = mem::replace(&mut self.current_thread_id, next_thread_id);
let paused_thread = self.threads.get_mut(&paused_thread_id).expect("paused thread does not exist");
paused_thread.stack_pointer().replace(paused_stack_pointer)
let paused_thread = self
.threads
.get_mut(&paused_thread_id)
.expect("paused thread does not exist");
paused_thread
.stack_pointer()
.replace(paused_stack_pointer)
.expect_none("running thread should have stack pointer set to None");
self.paused_threads.push_back(paused_thread_id);
}
pub fn add_new_thread(&mut self, thread: Thread) {
let thread_id = thread.id();
self.threads.insert(thread_id, thread).expect_none("thread already exists");
self.threads
.insert(thread_id, thread)
.expect_none("thread already exists");
self.paused_threads.push_back(thread_id);
}
pub fn current_thread_id(&self) -> ThreadId {
self.current_thread_id
}
}
}