vinzenz/redox
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Implement sched_yield, enable interrupts in userspace

Browse source
This commit is contained in:
Jeremy Soller 2016-09-10 19:18:59 -06:00
parent bd7bca30fa
commit 842826c1b0
5 changed files with 21 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
kernel/context/mod.rs
View file

@ -127,12 +127,11 @@ pub unsafe fn switch() {
arch::interrupt::pause();
}
let from_ptr = if let Some(context_lock) = contexts().current() {
let from_ptr = {
let contexts = contexts();
let context_lock = contexts.current().expect("context::switch: Not inside of context");
let mut context = context_lock.write();
context.deref_mut() as *mut Context
} else {
print!("NO FROM_PTR\n");
return;
};
let mut to_ptr = 0 as *mut Context;
@ -146,7 +145,9 @@ pub unsafe fn switch() {
}
if to_ptr as usize == 0 {
print!("NO TO_PTR\n");
// TODO: Sleep, wait for interrupt
// Unset global lock if no context found
arch::context::CONTEXT_SWITCH_LOCK.store(false, Ordering::SeqCst);
return;
}