michaelkuc6/blog_os
1
0
Fork 0
mirror of https://github.com/phil-opp/blog_os.git synced 2025-12-18 15:27:50 +00:00
Code Issues Projects Releases Wiki Activity

Switch current_thread_id before context switch

Browse Source
This commit is contained in:
Philipp Oppermann
2020-01-28 11:29:21 +01:00
parent 0caf5c351e
commit 87719f2260
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/multitasking/scheduler.rs
View File

@@ -28,7 +28,7 @@ impl Scheduler {
self.paused_threads.pop_front()
}
pub fn schedule(&mut self) -> Option<(ThreadId, VirtAddr)> {
pub fn schedule(&mut self) -> Option<(VirtAddr, ThreadId)> {
if let Some(next_id) = self.next_thread() {
let next_thread = self
.threads
@@ -38,7 +38,8 @@ impl Scheduler {
.stack_pointer()
.take()
.expect("paused thread has no stack pointer");
Some((next_id, next_stack_pointer))
let prev_thread_id = mem::replace(&mut self.current_thread_id, next_thread.id());
Some((next_stack_pointer, prev_thread_id))
} else {
None
}
@@ -47,9 +48,8 @@ impl Scheduler {
pub(super) fn add_paused_thread(
&mut self,
paused_stack_pointer: VirtAddr,
next_thread_id: ThreadId,
paused_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)