---

brson · brson · commit f726f0d1a600 · 2013-06-05T21:38:58.000-07:00
yaml --- r: 142595 b: refs/heads/try2 c: 1507df8 h: refs/heads/master i: 142593: 93158c3 142591: dc0a883 v: v3
diff --git a/[refs] b/[refs]
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: f7e242ab8a4ceffd87ec339086b7f8510e94aef1
+refs/heads/try2: 1507df87ccc93091ef5d918dc2c660f2e6f5a928
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
diff --git a/branches/try2/src/libstd/rt/sched.rs b/branches/try2/src/libstd/rt/sched.rs
@@ -148,7 +148,9 @@ pub impl Scheduler {
         }
 
         let sched = Local::take::<Scheduler>();
-        assert!(sched.work_queue.is_empty());
+        // XXX: Reenable this once we're using a per-task queue. With a shared
+        // queue this is not true
+        //assert!(sched.work_queue.is_empty());
         rtdebug!("scheduler metrics: %s\n", sched.metrics.to_str());
         return sched;
     }

Original file line number	Diff line number	Diff line change
`@@ -148,7 +148,9 @@ pub impl Scheduler {`
`148`	`148`	`}`
`149`	`149`
`150`	`150`	`let sched = Local::take::<Scheduler>();`
`151`		`- assert!(sched.work_queue.is_empty());`
	`151`	`+ // XXX: Reenable this once we're using a per-task queue. With a shared`
	`152`	`+ // queue this is not true`
	`153`	`+ //assert!(sched.work_queue.is_empty());`
`152`	`154`	`rtdebug!("scheduler metrics: %s\n", sched.metrics.to_str());`
`153`	`155`	`return sched;`
`154`	`156`	`}`