---

yaml
---
r: 71999
b: refs/heads/dist-snap
c: 6b084ba
h: refs/heads/master
i:
  71997: fc2762c
  71995: 90daa3d
  71991: 38eab25
  71983: 344f68f
  71967: 7a7b0f3
  71935: 1bbe313
v: v3

Author: brson

[refs]

@@ -7,7 +7,7 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
 refs/heads/incoming: b50030718cf28f2a5a81857a26b57442734fe854
-refs/heads/dist-snap: 1cb78e736f89cf286d454d7af05b470d570be1a7
+refs/heads/dist-snap: 6b084bad250e58c4003a1df40584f6385f44aac1
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/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();