---

yaml
---
r: 96923
b: refs/heads/dist-snap
c: afd4e2a
h: refs/heads/master
i:
  96921: 5aa3b5c
  96919: 6e023e7
v: v3

Author: alexcrichton

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: c274a6888410ce3e357e014568b43310ed787d36
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
-refs/heads/dist-snap: f5d9b2ca6d9a360112f06b3044897c22736c52b8
+refs/heads/dist-snap: afd4e2ad8dc4112b99c8d30996ff0bb5b0516b53
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/src/librustuv/addrinfo.rs

@@ -186,10 +186,12 @@ pub fn accum_addrinfo(addr: &Addrinfo) -> ~[ai::Info] {
 mod test {
     use std::io::net::ip::{SocketAddr, Ipv4Addr};
     use super::super::local_loop;
+    use super::GetAddrInfoRequest;
 
     #[test]
     fn getaddrinfo_test() {
-        match GetAddrInfoRequest::run(local_loop(), Some("localhost"), None, None) {
+        let loop_ = &mut local_loop().loop_;
+        match GetAddrInfoRequest::run(loop_, Some("localhost"), None, None) {
             Ok(infos) => {
                 let mut found_local = false;
                 let local_addr = &SocketAddr {
@@ -207,9 +209,10 @@ mod test {
 
     #[test]
     fn issue_10663() {
+        let loop_ = &mut local_loop().loop_;
         // Something should happen here, but this certainly shouldn't cause
         // everything to die. The actual outcome we don't care too much about.
-        GetAddrInfoRequest::run(local_loop(), Some("irc.n0v4.com"), None,
+        GetAddrInfoRequest::run(loop_, Some("irc.n0v4.com"), None,
                                 None);
     }
 }

branches/dist-snap/src/librustuv/async.rs

@@ -127,15 +127,15 @@ impl Drop for AsyncWatcher {
 mod test_remote {
     use std::rt::rtio::Callback;
     use std::rt::thread::Thread;
-    use std::rt::tube::Tube;
 
+    use super::AsyncWatcher;
     use super::super::local_loop;
 
     // Make sure that we can fire watchers in remote threads and that they
     // actually trigger what they say they will.
     #[test]
     fn smoke_test() {
-        struct MyCallback(Option<Tube<int>>);
+        struct MyCallback(Option<Chan<int>>);
         impl Callback for MyCallback {
             fn call(&mut self) {
                 // this can get called more than once, but we only want to send
@@ -146,16 +146,17 @@ mod test_remote {
             }
         }
 
-        let mut tube = Tube::new();
-        let cb = ~MyCallback(Some(tube.clone()));
-        let watcher = AsyncWatcher::new(local_loop(), cb as ~Callback);
+        let (port, chan) = Chan::new();
+        let cb = ~MyCallback(Some(chan));
+        let watcher = AsyncWatcher::new(&mut local_loop().loop_,
+                                        cb as ~Callback);
 
         let thread = do Thread::start {
             let mut watcher = watcher;
             watcher.fire();
         };
 
-        assert_eq!(tube.recv(), 1);
+        assert_eq!(port.recv(), 1);
         thread.join();
     }
 }

branches/dist-snap/src/librustuv/file.rs

@@ -448,7 +448,11 @@ mod test {
     use std::io;
     use std::str;
     use std::vec;
-    use l = super::super::local_loop;
+    use super::FsRequest;
+    use super::super::Loop;
+    use super::super::local_loop;
+
+    fn l() -> &mut Loop { &mut local_loop().loop_ }
 
     #[test]
     fn file_test_full_simple_sync() {
@@ -459,7 +463,7 @@ mod test {
 
         {
             // open/create
-            let result = FsRequest::open(l(), &path_str.to_c_str(),
+            let result = FsRequest::open(local_loop(), &path_str.to_c_str(),
                                          create_flags as int, mode as int);
             assert!(result.is_ok());
             let result = result.unwrap();
@@ -472,7 +476,7 @@ mod test {
 
         {
             // re-open
-            let result = FsRequest::open(l(), &path_str.to_c_str(),
+            let result = FsRequest::open(local_loop(), &path_str.to_c_str(),
                                          read_flags as int, 0);
             assert!(result.is_ok());
             let result = result.unwrap();
@@ -499,7 +503,7 @@ mod test {
         let create_flags = (O_RDWR | O_CREAT) as int;
         let mode = (S_IWUSR | S_IRUSR) as int;
 
-        let result = FsRequest::open(l(), path, create_flags, mode);
+        let result = FsRequest::open(local_loop(), path, create_flags, mode);
         assert!(result.is_ok());
         let file = result.unwrap();
 

branches/dist-snap/src/librustuv/homing.rs

@@ -142,3 +142,124 @@ impl Drop for HomingMissile {
         self.check("task moved away from the home scheduler");
     }
 }
+
+#[cfg(test)]
+mod test {
+    // On one thread, create a udp socket. Then send that socket to another
+    // thread and destroy the socket on the remote thread. This should make sure
+    // that homing kicks in for the socket to go back home to the original
+    // thread, close itself, and then come back to the last thread.
+    //#[test]
+    //fn test_homing_closes_correctly() {
+    //    let (port, chan) = Chan::new();
+
+    //    do task::spawn_sched(task::SingleThreaded) {
+    //        let listener = UdpWatcher::bind(local_loop(), next_test_ip4()).unwrap();
+    //        chan.send(listener);
+    //    }
+
+    //    do task::spawn_sched(task::SingleThreaded) {
+    //        port.recv();
+    //    }
+    //}
+
+    // This is a bit of a crufty old test, but it has its uses.
+    //#[test]
+    //fn test_simple_homed_udp_io_bind_then_move_task_then_home_and_close() {
+    //    use std::cast;
+    //    use std::rt::local::Local;
+    //    use std::rt::rtio::{EventLoop, IoFactory};
+    //    use std::rt::sched::Scheduler;
+    //    use std::rt::sched::{Shutdown, TaskFromFriend};
+    //    use std::rt::sleeper_list::SleeperList;
+    //    use std::rt::task::Task;
+    //    use std::rt::task::UnwindResult;
+    //    use std::rt::thread::Thread;
+    //    use std::rt::deque::BufferPool;
+    //    use std::unstable::run_in_bare_thread;
+    //    use uvio::UvEventLoop;
+
+    //    do run_in_bare_thread {
+    //        let sleepers = SleeperList::new();
+    //        let mut pool = BufferPool::new();
+    //        let (worker1, stealer1) = pool.deque();
+    //        let (worker2, stealer2) = pool.deque();
+    //        let queues = ~[stealer1, stealer2];
+
+    //        let loop1 = ~UvEventLoop::new() as ~EventLoop;
+    //        let mut sched1 = ~Scheduler::new(loop1, worker1, queues.clone(),
+    //                                         sleepers.clone());
+    //        let loop2 = ~UvEventLoop::new() as ~EventLoop;
+    //        let mut sched2 = ~Scheduler::new(loop2, worker2, queues.clone(),
+    //                                         sleepers.clone());
+
+    //        let handle1 = sched1.make_handle();
+    //        let handle2 = sched2.make_handle();
+    //        let tasksFriendHandle = sched2.make_handle();
+
+    //        let on_exit: proc(UnwindResult) = proc(exit_status) {
+    //            let mut handle1 = handle1;
+    //            let mut handle2 = handle2;
+    //            handle1.send(Shutdown);
+    //            handle2.send(Shutdown);
+    //            assert!(exit_status.is_success());
+    //        };
+
+    //        unsafe fn local_io() -> &'static mut IoFactory {
+    //            let mut sched = Local::borrow(None::<Scheduler>);
+    //            let io = sched.get().event_loop.io();
+    //            cast::transmute(io.unwrap())
+    //        }
+
+    //        let test_function: proc() = proc() {
+    //            let io = unsafe { local_io() };
+    //            let addr = next_test_ip4();
+    //            let maybe_socket = io.udp_bind(addr);
+    //            // this socket is bound to this event loop
+    //            assert!(maybe_socket.is_ok());
+
+    //            // block self on sched1
+    //            let scheduler: ~Scheduler = Local::take();
+    //            let mut tasksFriendHandle = Some(tasksFriendHandle);
+    //            scheduler.deschedule_running_task_and_then(|_, task| {
+    //                // unblock task
+    //                task.wake().map(|task| {
+    //                    // send self to sched2
+    //                    tasksFriendHandle.take_unwrap()
+    //                                     .send(TaskFromFriend(task));
+    //                });
+    //                // sched1 should now sleep since it has nothing else to do
+    //            })
+    //            // sched2 will wake up and get the task as we do nothing else,
+    //            // the function ends and the socket goes out of scope sched2
+    //            // will start to run the destructor the destructor will first
+    //            // block the task, set it's home as sched1, then enqueue it
+    //            // sched2 will dequeue the task, see that it has a home, and
+    //            // send it to sched1 sched1 will wake up, exec the close
+    //            // function on the correct loop, and then we're done
+    //        };
+
+    //        let mut main_task = ~Task::new_root(&mut sched1.stack_pool, None,
+    //                                            test_function);
+    //        main_task.death.on_exit = Some(on_exit);
+
+    //        let null_task = ~do Task::new_root(&mut sched2.stack_pool, None) {
+    //            // nothing
+    //        };
+
+    //        let main_task = main_task;
+    //        let sched1 = sched1;
+    //        let thread1 = do Thread::start {
+    //            sched1.bootstrap(main_task);
+    //        };
+
+    //        let sched2 = sched2;
+    //        let thread2 = do Thread::start {
+    //            sched2.bootstrap(null_task);
+    //        };
+
+    //        thread1.join();
+    //        thread2.join();
+    //    }
+    //}
+}

branches/dist-snap/src/librustuv/idle.rs

@@ -97,71 +97,102 @@ impl Drop for IdleWatcher {
 
 #[cfg(test)]
 mod test {
-    use std::rt::tube::Tube;
-    use std::rt::rtio::{Callback, PausableIdleCallback};
+    use std::cast;
+    use std::cell::RefCell;
+    use std::rc::Rc;
+    use std::rt::rtio::{Callback, PausibleIdleCallback};
+    use std::rt::task::{BlockedTask, Task};
+    use std::rt::local::Local;
+    use super::IdleWatcher;
     use super::super::local_loop;
 
-    struct MyCallback(Tube<int>, int);
+    type Chan = Rc<RefCell<(Option<BlockedTask>, uint)>>;
+
+    struct MyCallback(Rc<RefCell<(Option<BlockedTask>, uint)>>, uint);
     impl Callback for MyCallback {
         fn call(&mut self) {
-            match *self {
-                MyCallback(ref mut tube, val) => tube.send(val)
-            }
+            let task = match *self {
+                MyCallback(ref rc, n) => {
+                    let mut slot = rc.borrow().borrow_mut();
+                    match *slot.get() {
+                        (ref mut task, ref mut val) => {
+                            *val = n;
+                            task.take_unwrap()
+                        }
+                    }
+                }
+            };
+            task.wake().map(|t| t.reawaken(true));
         }
     }
 
+    fn mk(v: uint) -> (~IdleWatcher, Chan) {
+        let rc = Rc::from_send(RefCell::new((None, 0)));
+        let cb = ~MyCallback(rc.clone(), v);
+        let cb = cb as ~Callback:;
+        let cb = unsafe { cast::transmute(cb) };
+        (IdleWatcher::new(&mut local_loop().loop_, cb), rc)
+    }
+
+    fn sleep(chan: &Chan) -> uint {
+        let task: ~Task = Local::take();
+        task.deschedule(1, |task| {
+            let mut slot = chan.borrow().borrow_mut();
+            match *slot.get() {
+                (ref mut slot, _) => {
+                    assert!(slot.is_none());
+                    *slot = Some(task);
+                }
+            }
+            Ok(())
+        });
+
+        let slot = chan.borrow().borrow();
+        match *slot.get() { (_, n) => n }
+    }
+
     #[test]
     fn not_used() {
-        let cb = ~MyCallback(Tube::new(), 1);
-        let _idle = IdleWatcher::new(local_loop(), cb as ~Callback);
+        let (_idle, _chan) = mk(1);
     }
 
     #[test]
     fn smoke_test() {
-        let mut tube = Tube::new();
-        let cb = ~MyCallback(tube.clone(), 1);
-        let mut idle = IdleWatcher::new(local_loop(), cb as ~Callback);
+        let (mut idle, chan) = mk(1);
         idle.resume();
-        tube.recv();
+        assert_eq!(sleep(&chan), 1);
     }
 
     #[test] #[should_fail]
     fn smoke_fail() {
-        let tube = Tube::new();
-        let cb = ~MyCallback(tube.clone(), 1);
-        let mut idle = IdleWatcher::new(local_loop(), cb as ~Callback);
+        let (mut idle, _chan) = mk(1);
         idle.resume();
         fail!();
     }
 
     #[test]
     fn fun_combinations_of_methods() {
-        let mut tube = Tube::new();
-        let cb = ~MyCallback(tube.clone(), 1);
-        let mut idle = IdleWatcher::new(local_loop(), cb as ~Callback);
+        let (mut idle, chan) = mk(1);
         idle.resume();
-        tube.recv();
+        assert_eq!(sleep(&chan), 1);
         idle.pause();
         idle.resume();
         idle.resume();
-        tube.recv();
+        assert_eq!(sleep(&chan), 1);
         idle.pause();
         idle.pause();
         idle.resume();
-        tube.recv();
+        assert_eq!(sleep(&chan), 1);
     }
 
     #[test]
     fn pause_pauses() {
-        let mut tube = Tube::new();
-        let cb = ~MyCallback(tube.clone(), 1);
-        let mut idle1 = IdleWatcher::new(local_loop(), cb as ~Callback);
-        let cb = ~MyCallback(tube.clone(), 2);
-        let mut idle2 = IdleWatcher::new(local_loop(), cb as ~Callback);
+        let (mut idle1, chan1) = mk(1);
+        let (mut idle2, chan2) = mk(2);
         idle2.resume();
-        assert_eq!(tube.recv(), 2);
+        assert_eq!(sleep(&chan2), 2);
         idle2.pause();
         idle1.resume();
-        assert_eq!(tube.recv(), 1);
+        assert_eq!(sleep(&chan1), 1);
     }
 }