mirror of
https://github.com/rust-lang/rust.git
synced 2024-11-30 02:33:55 +00:00
core::rt: Insert calls to run_cleanup_tasks after all context switches
This commit is contained in:
parent
1cb78e736f
commit
6b084bad25
@ -212,7 +212,7 @@ pub impl Scheduler {
|
|||||||
Context::swap(last_task_context, sched_context);
|
Context::swap(last_task_context, sched_context);
|
||||||
}
|
}
|
||||||
|
|
||||||
// XXX: Should probably run cleanup jobs
|
self.run_cleanup_jobs();
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Switch directly to another task, without going through the scheduler.
|
/// Switch directly to another task, without going through the scheduler.
|
||||||
@ -233,7 +233,7 @@ pub impl Scheduler {
|
|||||||
Context::swap(last_task_context, next_task_context);
|
Context::swap(last_task_context, next_task_context);
|
||||||
}
|
}
|
||||||
|
|
||||||
// XXX: Should probably run cleanup jobs
|
self.run_cleanup_jobs();
|
||||||
}
|
}
|
||||||
|
|
||||||
// * Other stuff
|
// * Other stuff
|
||||||
@ -245,7 +245,6 @@ pub impl Scheduler {
|
|||||||
}
|
}
|
||||||
|
|
||||||
fn run_cleanup_jobs(&mut self) {
|
fn run_cleanup_jobs(&mut self) {
|
||||||
assert!(!self.in_task_context());
|
|
||||||
rtdebug!("running cleanup jobs");
|
rtdebug!("running cleanup jobs");
|
||||||
|
|
||||||
while !self.cleanup_jobs.is_empty() {
|
while !self.cleanup_jobs.is_empty() {
|
||||||
@ -325,8 +324,12 @@ pub impl Task {
|
|||||||
priv fn build_start_wrapper(start: ~fn()) -> ~fn() {
|
priv fn build_start_wrapper(start: ~fn()) -> ~fn() {
|
||||||
// XXX: The old code didn't have this extra allocation
|
// XXX: The old code didn't have this extra allocation
|
||||||
let wrapper: ~fn() = || {
|
let wrapper: ~fn() = || {
|
||||||
// XXX: Should probably run scheduler cleanup jobs for situations
|
// This is the first code to execute after the initial
|
||||||
// where a task context switches directly to a new task
|
// context switch to the task. The previous context may
|
||||||
|
// have asked us to do some cleanup.
|
||||||
|
let mut sched = ThreadLocalScheduler::new();
|
||||||
|
let sched = sched.get_scheduler();
|
||||||
|
sched.run_cleanup_jobs();
|
||||||
|
|
||||||
start();
|
start();
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user