---

yaml
---
r: 139826
b: refs/heads/try2
c: 1cb78e7
h: refs/heads/master
v: v3

Author: brson

[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: 8e966216c7c59c1b1de08561502f0b78589db59a
+refs/heads/try2: 1cb78e736f89cf286d454d7af05b470d570be1a7
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/libcore/rt/sched.rs

@@ -195,7 +195,7 @@ pub impl Scheduler {
     /// The closure here is a *stack* closure that lives in the
     /// running task.  It gets transmuted to the scheduler's lifetime
     /// and called while the task is blocked.
-    fn block_running_task_and_then(&mut self, f: &fn(&mut Scheduler, ~Task)) {
+    fn deschedule_running_task_and_then(&mut self, f: &fn(&mut Scheduler, ~Task)) {
         assert!(self.in_task_context());
 
         rtdebug!("blocking task");
@@ -566,7 +566,7 @@ fn test_block_task() {
         let task = ~do Task::new(&mut sched.stack_pool) {
             do Scheduler::local |sched| {
                 assert!(sched.in_task_context());
-                do sched.block_running_task_and_then() |sched, task| {
+                do sched.deschedule_running_task_and_then() |sched, task| {
                     assert!(!sched.in_task_context());
                     sched.task_queue.push_back(task);
                 }

branches/try2/src/libcore/rt/uvio.rs

@@ -108,7 +108,7 @@ impl IoFactory for UvIoFactory {
             assert!(scheduler.in_task_context());
 
             // Block this task and take ownership, switch to scheduler context
-            do scheduler.block_running_task_and_then |scheduler, task| {
+            do scheduler.deschedule_running_task_and_then |scheduler, task| {
 
                 rtdebug!("connect: entered scheduler context");
                 assert!(!scheduler.in_task_context());
@@ -181,7 +181,7 @@ impl TcpListener for UvTcpListener {
         do Scheduler::local |scheduler| {
             assert!(scheduler.in_task_context());
 
-            do scheduler.block_running_task_and_then |_, task| {
+            do scheduler.deschedule_running_task_and_then |_, task| {
                 let task_cell = Cell(task);
                 let mut server_tcp_watcher = server_tcp_watcher;
                 do server_tcp_watcher.listen |server_stream_watcher, status| {
@@ -247,7 +247,7 @@ impl Stream for UvStream {
             assert!(scheduler.in_task_context());
             let watcher = self.watcher();
             let buf_ptr: *&mut [u8] = &buf;
-            do scheduler.block_running_task_and_then |scheduler, task| {
+            do scheduler.deschedule_running_task_and_then |scheduler, task| {
                 rtdebug!("read: entered scheduler context");
                 assert!(!scheduler.in_task_context());
                 let mut watcher = watcher;
@@ -293,7 +293,7 @@ impl Stream for UvStream {
             assert!(scheduler.in_task_context());
             let watcher = self.watcher();
             let buf_ptr: *&[u8] = &buf;
-            do scheduler.block_running_task_and_then |_, task| {
+            do scheduler.deschedule_running_task_and_then |_, task| {
                 let mut watcher = watcher;
                 let task_cell = Cell(task);
                 let buf = unsafe { &*buf_ptr };
@@ -420,7 +420,7 @@ fn test_read_and_block() {
                         // Yield to the other task in hopes that it
                         // will trigger a read callback while we are
                         // not ready for it
-                        do scheduler.block_running_task_and_then |scheduler, task| {
+                        do scheduler.deschedule_running_task_and_then |scheduler, task| {
                             scheduler.task_queue.push_back(task);
                         }
                     }