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

Improvements for context switching

Browse source
This commit is contained in:
Jeremy Soller 2016-08-30 16:23:51 -06:00
parent 3a232cc60f
commit d3dfff8d51
6 changed files with 68 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

26
kernel/lib.rs
View file

@ -121,8 +121,10 @@ pub mod syscall;
pub mod tests;
pub extern fn context_test() {
print!("TEST\n");
print!("Test\n");
unsafe { context::switch(); }
print!("Test halt\n");
loop {
unsafe { interrupt::enable_and_halt(); }
}
@ -134,26 +136,14 @@ pub extern fn kmain() {
print!("{}", format!("BSP: {:?}\n", syscall::getpid()));
let to_ptr = if let Ok(context_lock) = context::contexts_mut().spawn(context_test) {
if let Ok(context_lock) = context::contexts_mut().spawn(context_test) {
print!("Spawned context\n");
let mut context = context_lock.write();
&mut context.arch as *mut arch::context::Context
} else {
0 as *mut arch::context::Context
};
let from_ptr = if let Some(context_lock) = context::contexts().current() {
let mut context = context_lock.write();
&mut context.arch as *mut arch::context::Context
} else {
0 as *mut arch::context::Context
};
if to_ptr as usize != 0 && from_ptr as usize != 0 {
print!("Switching\n");
unsafe { (&mut *from_ptr).switch_to(&mut *to_ptr); }
}
print!("Main\n");
unsafe { context::switch(); }
print!("Main halt\n");
loop {
unsafe { interrupt::enable_and_halt(); }
}