mara/redox
Watch
0
0
Fork
You've already forked redox
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Collapse status of context into one status variable

Browse source
This commit is contained in:
Jeremy Soller 2016-09-16 11:10:53 -06:00
commit 6ad843184d
1 changed files with 19 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

6
kernel/context/switch.rs
View file

@ -1,7 +1,7 @@
use core::sync::atomic::Ordering;
use arch;
use super::{contexts, Context, CONTEXT_ID};
use super::{contexts, Context, Status, CONTEXT_ID};
/// Switch to the next context
///
@ -28,7 +28,7 @@ pub unsafe fn switch() {
for (pid, context_lock) in contexts().iter() {
if *pid > (*from_ptr).id {
let mut context = context_lock.write();
if ! context.running && ! context.blocked && ! context.exited {
if context.status == Status::Runnable && ! context.running {
to_ptr = context.deref_mut() as *mut Context;
break;
}
@ -39,7 +39,7 @@ pub unsafe fn switch() {
for (pid, context_lock) in contexts().iter() {
if *pid < (*from_ptr).id {
let mut context = context_lock.write();
if ! context.running && ! context.blocked && ! context.exited {
if context.status == Status::Runnable && ! context.running {
to_ptr = context.deref_mut() as *mut Context;
break;
}