---

yaml
---
r: 55525
b: refs/heads/master
c: 6b084ba
h: refs/heads/master
i:
  55523: 919c5e8
v: v3

Author: brson

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 1cb78e736f89cf286d454d7af05b470d570be1a7
+refs/heads/master: 6b084bad250e58c4003a1df40584f6385f44aac1
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 79a2b2eafc3c766cecec8a5f76317693bae9ed17
 refs/heads/try: 8eb2bab100b42f0ba751552d8eff00eb2134c55a

trunk/src/libcore/rt/sched.rs

@@ -212,7 +212,7 @@ pub impl Scheduler {
             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.
@@ -233,7 +233,7 @@ pub impl Scheduler {
             Context::swap(last_task_context, next_task_context);
         }
 
-        // XXX: Should probably run cleanup jobs
+        self.run_cleanup_jobs();
     }
 
     // * Other stuff
@@ -245,7 +245,6 @@ pub impl Scheduler {
     }
 
     fn run_cleanup_jobs(&mut self) {
-        assert!(!self.in_task_context());
         rtdebug!("running cleanup jobs");
 
         while !self.cleanup_jobs.is_empty() {
@@ -325,8 +324,12 @@ pub impl Task {
     priv fn build_start_wrapper(start: ~fn()) -> ~fn() {
         // XXX: The old code didn't have this extra allocation
         let wrapper: ~fn() = || {
-            // XXX: Should probably run scheduler cleanup jobs for situations
-            // where a task context switches directly to a new task
+            // This is the first code to execute after the initial
+            // 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();