nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-30 02:33:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

core::rt: All context switches are followed by a cleanup action

Browse Source
This commit is contained in:
Brian Anderson 2013-04-14 20:24:15 -07:00
parent 5f52aecb1e
commit a2e5827866
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/libcore/rt/sched.rs
View File

@ -60,6 +60,7 @@ impl HackAroundBorrowCk for UnsafeTaskReceiver {
}
enum CleanupJob {
DoNothing,
RescheduleTask(~Task),
RecycleTask(~Task),
GiveTask(~Task, UnsafeTaskReceiver)
@ -148,6 +149,7 @@ pub impl Scheduler {
// Store the task in the scheduler so it can be grabbed later
self.current_task = Some(task);
self.enqueue_cleanup_job(DoNothing);
// Take pointers to both the task and scheduler's saved registers.
{
@ -243,14 +245,13 @@ pub impl Scheduler {
}
fn run_cleanup_job(&mut self) {
rtdebug!("running cleanup jobs");
rtdebug!("running cleanup job");
if self.cleanup_job.is_none() {
return;
}
assert!(self.cleanup_job.is_some());
let cleanup_job = self.cleanup_job.swap_unwrap();
match cleanup_job {
DoNothing => { }
RescheduleTask(task) => {
// NB: Pushing to the *front* of the queue
self.task_queue.push_front(task);
@ -278,9 +279,10 @@ pub impl Scheduler {
Some(GiveTask(~ref task, _)) => {
Some(task)
}
None => {
Some(DoNothing) => {
None
}
None => fail!(fmt!("all context switches should have a cleanup job"))
};
// XXX: Pattern matching mutable pointers above doesn't work
// because borrowck thinks the three patterns are conflicting