]> git.lizzy.rs Git - rust.git/blobdiff - src/librustuv/net.rs
Fix usage of libuv for windows
[rust.git] / src / librustuv / net.rs
index 0aaa931c9475e0ea7e52592fd5666ae0482621c6..32c9b6c3d172999f6efffb262b81ca3624840784 100644 (file)
@@ -8,91 +8,82 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use std::libc::{size_t, ssize_t, c_int, c_void, c_uint};
-use std::vec;
+use std::cast;
+use std::libc;
+use std::libc::{size_t, ssize_t, c_int, c_void, c_uint, c_char};
+use std::ptr;
+use std::rt::BlockedTask;
+use std::rt::io::IoError;
+use std::rt::io::net::ip::{Ipv4Addr, Ipv6Addr, SocketAddr, IpAddr};
+use std::rt::local::Local;
+use std::rt::rtio;
+use std::rt::sched::{Scheduler, SchedHandle};
+use std::rt::tube::Tube;
 use std::str;
-use std::rt::io::net::ip::{SocketAddr, Ipv4Addr, Ipv6Addr};
+use std::task;
+use std::vec;
 
+use stream::StreamWatcher;
+use super::{Loop, Request, UvError, Buf, status_to_io_result,
+            uv_error_to_io_error, UvHandle, slice_to_uv_buf,
+            wait_until_woken_after};
+use uvio::HomingIO;
 use uvll;
-use uvll::*;
-use super::{AllocCallback, ConnectionCallback, ReadCallback, UdpReceiveCallback,
-            UdpSendCallback, Loop, Watcher, Request, UvError, Buf, NativeHandle,
-            status_to_maybe_uv_error, empty_buf};
-
-pub struct UvAddrInfo(*uvll::addrinfo);
-
-pub enum UvSocketAddr {
-    UvIpv4SocketAddr(*sockaddr_in),
-    UvIpv6SocketAddr(*sockaddr_in6),
-}
+use uvll::sockaddr;
 
-pub fn sockaddr_to_UvSocketAddr(addr: *uvll::sockaddr) -> UvSocketAddr {
-    unsafe {
-        assert!((is_ip4_addr(addr) || is_ip6_addr(addr)));
-        assert!(!(is_ip4_addr(addr) && is_ip6_addr(addr)));
-        match addr {
-            _ if is_ip4_addr(addr) => UvIpv4SocketAddr(addr as *uvll::sockaddr_in),
-            _ if is_ip6_addr(addr) => UvIpv6SocketAddr(addr as *uvll::sockaddr_in6),
-            _ => fail!(),
-        }
-    }
-}
+////////////////////////////////////////////////////////////////////////////////
+/// Generic functions related to dealing with sockaddr things
+////////////////////////////////////////////////////////////////////////////////
 
-fn socket_addr_as_uv_socket_addr<T>(addr: SocketAddr, f: &fn(UvSocketAddr) -> T) -> T {
+#[fixed_stack_segment]
+fn socket_addr_as_sockaddr<T>(addr: SocketAddr, f: &fn(*sockaddr) -> T) -> T {
     let malloc = match addr.ip {
-        Ipv4Addr(*) => malloc_ip4_addr,
-        Ipv6Addr(*) => malloc_ip6_addr,
-    };
-    let wrap = match addr.ip {
-        Ipv4Addr(*) => UvIpv4SocketAddr,
-        Ipv6Addr(*) => UvIpv6SocketAddr,
-    };
-    let free = match addr.ip {
-        Ipv4Addr(*) => free_ip4_addr,
-        Ipv6Addr(*) => free_ip6_addr,
+        Ipv4Addr(*) => uvll::rust_malloc_ip4_addr,
+        Ipv6Addr(*) => uvll::rust_malloc_ip6_addr,
     };
 
-    let addr = unsafe { malloc(addr.ip.to_str(), addr.port as int) };
+    let ip = addr.ip.to_str();
+    let addr = ip.with_c_str(|p| unsafe { malloc(p, addr.port as c_int) });
     do (|| {
-        f(wrap(addr))
+        f(addr)
     }).finally {
-        unsafe { free(addr) };
+        unsafe { libc::free(addr) };
     }
 }
 
-fn uv_socket_addr_as_socket_addr<T>(addr: UvSocketAddr, f: &fn(SocketAddr) -> T) -> T {
-    let ip_size = match addr {
-        UvIpv4SocketAddr(*) => 4/*groups of*/ * 3/*digits separated by*/ + 3/*periods*/,
-        UvIpv6SocketAddr(*) => 8/*groups of*/ * 4/*hex digits separated by*/ + 7 /*colons*/,
-    };
-    let ip_name = {
-        let buf = vec::from_elem(ip_size + 1 /*null terminated*/, 0u8);
-        unsafe {
+#[fixed_stack_segment]
+pub fn sockaddr_to_socket_addr(addr: *sockaddr) -> SocketAddr {
+    unsafe {
+        let ip_size = if uvll::rust_is_ipv4_sockaddr(addr) == 1 {
+            4/*groups of*/ * 3/*digits separated by*/ + 3/*periods*/
+        } else if uvll::rust_is_ipv6_sockaddr(addr) == 1 {
+            8/*groups of*/ * 4/*hex digits separated by*/ + 7 /*colons*/
+        } else {
+            fail!("unknown address?");
+        };
+        let ip_name = {
+            let buf = vec::from_elem(ip_size + 1 /*null terminated*/, 0u8);
             let buf_ptr = vec::raw::to_ptr(buf);
-            match addr {
-                UvIpv4SocketAddr(addr) => uvll::ip4_name(addr, buf_ptr, ip_size as size_t),
-                UvIpv6SocketAddr(addr) => uvll::ip6_name(addr, buf_ptr, ip_size as size_t),
+            if uvll::rust_is_ipv4_sockaddr(addr) == 1 {
+                uvll::uv_ip4_name(addr, buf_ptr as *c_char, ip_size as size_t);
+            } else {
+                uvll::uv_ip6_name(addr, buf_ptr as *c_char, ip_size as size_t);
             }
+            buf
         };
-        buf
-    };
-    let ip_port = unsafe {
-        let port = match addr {
-            UvIpv4SocketAddr(addr) => uvll::ip4_port(addr),
-            UvIpv6SocketAddr(addr) => uvll::ip6_port(addr),
+        let ip_port = {
+            let port = if uvll::rust_is_ipv4_sockaddr(addr) == 1 {
+                uvll::rust_ip4_port(addr)
+            } else {
+                uvll::rust_ip6_port(addr)
+            };
+            port as u16
         };
-        port as u16
-    };
-    let ip_str = str::from_utf8_slice(ip_name).trim_right_chars(&'\x00');
-    let ip_addr = FromStr::from_str(ip_str).unwrap();
-
-    // finally run the closure
-    f(SocketAddr { ip: ip_addr, port: ip_port })
-}
+        let ip_str = str::from_utf8_slice(ip_name).trim_right_chars(&'\x00');
+        let ip_addr = FromStr::from_str(ip_str).unwrap();
 
-pub fn uv_socket_addr_to_socket_addr(addr: UvSocketAddr) -> SocketAddr {
-    use std::util;
-    uv_socket_addr_as_socket_addr(addr, util::id)
+        SocketAddr { ip: ip_addr, port: ip_port }
+    }
 }
 
 #[cfg(test)]
@@ -100,7 +91,9 @@ pub fn uv_socket_addr_to_socket_addr(addr: UvSocketAddr) -> SocketAddr {
 fn test_ip4_conversion() {
     use std::rt;
     let ip4 = rt::test::next_test_ip4();
-    assert_eq!(ip4, socket_addr_as_uv_socket_addr(ip4, uv_socket_addr_to_socket_addr));
+    do socket_addr_as_sockaddr(ip4) |addr| {
+        assert_eq!(ip4, sockaddr_to_socket_addr(addr));
+    }
 }
 
 #[cfg(test)]
@@ -108,744 +101,1187 @@ fn test_ip4_conversion() {
 fn test_ip6_conversion() {
     use std::rt;
     let ip6 = rt::test::next_test_ip6();
-    assert_eq!(ip6, socket_addr_as_uv_socket_addr(ip6, uv_socket_addr_to_socket_addr));
-}
-
-// uv_stream_t is the parent class of uv_tcp_t, uv_pipe_t, uv_tty_t
-// and uv_file_t
-pub struct StreamWatcher(*uvll::uv_stream_t);
-impl Watcher for StreamWatcher { }
-
-impl StreamWatcher {
-    pub fn read_start(&mut self, alloc: AllocCallback, cb: ReadCallback) {
-        unsafe {
-            match uvll::read_start(self.native_handle(), alloc_cb, read_cb) {
-                0 => {
-                    let data = self.get_watcher_data();
-                    data.alloc_cb = Some(alloc);
-                    data.read_cb = Some(cb);
-                }
-                n => {
-                    cb(*self, 0, empty_buf(), Some(UvError(n)))
-                }
-            }
-        }
+    do socket_addr_as_sockaddr(ip6) |addr| {
+        assert_eq!(ip6, sockaddr_to_socket_addr(addr));
+    }
+}
 
-        extern fn alloc_cb(stream: *uvll::uv_stream_t, suggested_size: size_t) -> Buf {
-            let mut stream_watcher: StreamWatcher = NativeHandle::from_native_handle(stream);
-            let alloc_cb = stream_watcher.get_watcher_data().alloc_cb.get_ref();
-            return (*alloc_cb)(suggested_size as uint);
-        }
+enum SocketNameKind {
+    TcpPeer,
+    Tcp,
+    Udp
+}
 
-        extern fn read_cb(stream: *uvll::uv_stream_t, nread: ssize_t, buf: Buf) {
-            uvdebug!("buf addr: {}", buf.base);
-            uvdebug!("buf len: {}", buf.len);
-            let mut stream_watcher: StreamWatcher = NativeHandle::from_native_handle(stream);
-            let cb = stream_watcher.get_watcher_data().read_cb.get_ref();
-            let status = status_to_maybe_uv_error(nread as c_int);
-            (*cb)(stream_watcher, nread as int, buf, status);
-        }
+#[fixed_stack_segment]
+fn socket_name(sk: SocketNameKind, handle: *c_void) -> Result<SocketAddr, IoError> {
+    unsafe {
+        let getsockname = match sk {
+            TcpPeer => uvll::uv_tcp_getpeername,
+            Tcp     => uvll::uv_tcp_getsockname,
+            Udp     => uvll::uv_udp_getsockname,
+        };
+
+        // Allocate a sockaddr_storage
+        // since we don't know if it's ipv4 or ipv6
+        let size = uvll::rust_sockaddr_size();
+        let name = libc::malloc(size as size_t);
+        assert!(!name.is_null());
+        let mut namelen = size;
+
+        let ret = match getsockname(handle, name, &mut namelen) {
+            0 => Ok(sockaddr_to_socket_addr(name)),
+            n => Err(uv_error_to_io_error(UvError(n)))
+        };
+        libc::free(name);
+        ret
     }
+}
+
+////////////////////////////////////////////////////////////////////////////////
+/// TCP implementation
+////////////////////////////////////////////////////////////////////////////////
 
-    pub fn read_stop(&mut self) {
-        // It would be nice to drop the alloc and read callbacks here,
-        // but read_stop may be called from inside one of them and we
-        // would end up freeing the in-use environment
-        let handle = self.native_handle();
-        unsafe { assert_eq!(uvll::read_stop(handle), 0); }
+pub struct TcpWatcher {
+    handle: *uvll::uv_tcp_t,
+    stream: StreamWatcher,
+    home: SchedHandle,
+}
+
+pub struct TcpListener {
+    home: SchedHandle,
+    handle: *uvll::uv_pipe_t,
+    priv closing_task: Option<BlockedTask>,
+    priv outgoing: Tube<Result<~rtio::RtioTcpStream, IoError>>,
+}
+
+pub struct TcpAcceptor {
+    listener: ~TcpListener,
+    priv incoming: Tube<Result<~rtio::RtioTcpStream, IoError>>,
+}
+
+// TCP watchers (clients/streams)
+
+impl TcpWatcher {
+    pub fn new(loop_: &Loop) -> TcpWatcher {
+        let handle = unsafe { uvll::malloc_handle(uvll::UV_TCP) };
+        assert_eq!(unsafe {
+            uvll::uv_tcp_init(loop_.handle, handle)
+        }, 0);
+        TcpWatcher {
+            home: get_handle_to_current_scheduler!(),
+            handle: handle,
+            stream: StreamWatcher::new(handle),
+        }
     }
 
-    pub fn write(&mut self, buf: Buf, cb: ConnectionCallback) {
-        let req = WriteRequest::new();
-        return unsafe {
-            match uvll::write(req.native_handle(), self.native_handle(),
-                              [buf], write_cb) {
-                0 => {
-                    let data = self.get_watcher_data();
-                    assert!(data.write_cb.is_none());
-                    data.write_cb = Some(cb);
-                }
-                n => {
-                    req.delete();
-                    cb(*self, Some(UvError(n)))
+    pub fn connect(loop_: &mut Loop, address: SocketAddr)
+        -> Result<TcpWatcher, UvError>
+    {
+        struct Ctx { status: c_int, task: Option<BlockedTask> }
+
+        return do task::unkillable {
+            let tcp = TcpWatcher::new(loop_);
+            let ret = do socket_addr_as_sockaddr(address) |addr| {
+                let mut req = Request::new(uvll::UV_CONNECT);
+                let result = unsafe {
+                    uvll::uv_tcp_connect(req.handle, tcp.handle, addr,
+                                         connect_cb)
+                };
+                match result {
+                    0 => {
+                        req.defuse(); // uv callback now owns this request
+                        let mut cx = Ctx { status: 0, task: None };
+                        do wait_until_woken_after(&mut cx.task) {
+                            req.set_data(&cx);
+                        }
+                        match cx.status {
+                            0 => Ok(()),
+                            n => Err(UvError(n)),
+                        }
+                    }
+                    n => Err(UvError(n))
                 }
+            };
+
+            match ret {
+                Ok(()) => Ok(tcp),
+                Err(e) => Err(e),
             }
         };
 
-        extern fn write_cb(req: *uvll::uv_write_t, status: c_int) {
-            let write_request: WriteRequest = NativeHandle::from_native_handle(req);
-            let mut stream_watcher = write_request.stream();
-            write_request.delete();
-            let cb = stream_watcher.get_watcher_data().write_cb.take_unwrap();
-            let status = status_to_maybe_uv_error(status);
-            cb(stream_watcher, status);
+        extern fn connect_cb(req: *uvll::uv_connect_t, status: c_int) {
+            let req = Request::wrap(req);
+            assert!(status != uvll::ECANCELED);
+            let cx: &mut Ctx = unsafe { req.get_data() };
+            cx.status = status;
+            let scheduler: ~Scheduler = Local::take();
+            scheduler.resume_blocked_task_immediately(cx.task.take_unwrap());
         }
     }
+}
+
+impl HomingIO for TcpWatcher {
+    fn home<'r>(&'r mut self) -> &'r mut SchedHandle { &mut self.home }
+}
+
+impl rtio::RtioSocket for TcpWatcher {
+    fn socket_name(&mut self) -> Result<SocketAddr, IoError> {
+        let _m = self.fire_homing_missile();
+        socket_name(Tcp, self.handle)
+    }
+}
 
+impl rtio::RtioTcpStream for TcpWatcher {
+    fn read(&mut self, buf: &mut [u8]) -> Result<uint, IoError> {
+        let _m = self.fire_homing_missile();
+        self.stream.read(buf).map_err(uv_error_to_io_error)
+    }
 
-    pub fn listen(&mut self, cb: ConnectionCallback) -> Result<(), UvError> {
-        {
-            let data = self.get_watcher_data();
-            assert!(data.connect_cb.is_none());
-            data.connect_cb = Some(cb);
-        }
+    fn write(&mut self, buf: &[u8]) -> Result<(), IoError> {
+        let _m = self.fire_homing_missile();
+        self.stream.write(buf).map_err(uv_error_to_io_error)
+    }
 
-        return unsafe {
-            static BACKLOG: c_int = 128; // XXX should be configurable
-            match uvll::listen(self.native_handle(), BACKLOG, connection_cb) {
-                0 => Ok(()),
-                n => Err(UvError(n))
-            }
-        };
+    fn peer_name(&mut self) -> Result<SocketAddr, IoError> {
+        let _m = self.fire_homing_missile();
+        socket_name(TcpPeer, self.handle)
+    }
 
-        extern fn connection_cb(handle: *uvll::uv_stream_t, status: c_int) {
-            uvdebug!("connection_cb");
-            let mut stream_watcher: StreamWatcher = NativeHandle::from_native_handle(handle);
-            let cb = stream_watcher.get_watcher_data().connect_cb.get_ref();
-            let status = status_to_maybe_uv_error(status);
-            (*cb)(stream_watcher, status);
-        }
+    fn control_congestion(&mut self) -> Result<(), IoError> {
+        let _m = self.fire_homing_missile();
+        status_to_io_result(unsafe {
+            uvll::uv_tcp_nodelay(self.handle, 0 as c_int)
+        })
     }
 
-    pub fn accept(&mut self, stream: StreamWatcher) {
-        let self_handle = self.native_handle() as *c_void;
-        let stream_handle = stream.native_handle() as *c_void;
-        assert_eq!(0, unsafe { uvll::accept(self_handle, stream_handle) } );
+    fn nodelay(&mut self) -> Result<(), IoError> {
+        let _m = self.fire_homing_missile();
+        status_to_io_result(unsafe {
+            uvll::uv_tcp_nodelay(self.handle, 1 as c_int)
+        })
     }
-}
 
-impl NativeHandle<*uvll::uv_stream_t> for StreamWatcher {
-    fn from_native_handle(handle: *uvll::uv_stream_t) -> StreamWatcher {
-        StreamWatcher(handle)
+    fn keepalive(&mut self, delay_in_seconds: uint) -> Result<(), IoError> {
+        let _m = self.fire_homing_missile();
+        status_to_io_result(unsafe {
+            uvll::uv_tcp_keepalive(self.handle, 1 as c_int,
+                                   delay_in_seconds as c_uint)
+        })
     }
-    fn native_handle(&self) -> *uvll::uv_stream_t {
-        match self { &StreamWatcher(ptr) => ptr }
+
+    fn letdie(&mut self) -> Result<(), IoError> {
+        let _m = self.fire_homing_missile();
+        status_to_io_result(unsafe {
+            uvll::uv_tcp_keepalive(self.handle, 0 as c_int, 0 as c_uint)
+        })
     }
 }
 
-pub struct TcpWatcher(*uvll::uv_tcp_t);
-impl Watcher for TcpWatcher { }
+impl UvHandle<uvll::uv_tcp_t> for TcpWatcher {
+    fn uv_handle(&self) -> *uvll::uv_tcp_t { self.stream.handle }
+}
 
-impl TcpWatcher {
-    pub fn new(loop_: &Loop) -> TcpWatcher {
-        unsafe {
-            let handle = malloc_handle(UV_TCP);
-            assert!(handle.is_not_null());
-            assert_eq!(0, uvll::tcp_init(loop_.native_handle(), handle));
-            let mut watcher: TcpWatcher = NativeHandle::from_native_handle(handle);
-            watcher.install_watcher_data();
-            return watcher;
-        }
-    }
-
-    pub fn bind(&mut self, address: SocketAddr) -> Result<(), UvError> {
-        do socket_addr_as_uv_socket_addr(address) |addr| {
-            let result = unsafe {
-                match addr {
-                    UvIpv4SocketAddr(addr) => uvll::tcp_bind(self.native_handle(), addr),
-                    UvIpv6SocketAddr(addr) => uvll::tcp_bind6(self.native_handle(), addr),
-                }
+impl Drop for TcpWatcher {
+    fn drop(&mut self) {
+        let _m = self.fire_homing_missile();
+        self.close();
+    }
+}
+
+// TCP listeners (unbound servers)
+
+impl TcpListener {
+    pub fn bind(loop_: &mut Loop, address: SocketAddr)
+        -> Result<~TcpListener, UvError>
+    {
+        do task::unkillable {
+            let handle = unsafe { uvll::malloc_handle(uvll::UV_TCP) };
+            assert_eq!(unsafe {
+                uvll::uv_tcp_init(loop_.handle, handle)
+            }, 0);
+            let l = ~TcpListener {
+                home: get_handle_to_current_scheduler!(),
+                handle: handle,
+                closing_task: None,
+                outgoing: Tube::new(),
             };
-            match result {
-                0 => Ok(()),
-                _ => Err(UvError(result)),
+            let res = socket_addr_as_sockaddr(address, |addr| unsafe {
+                uvll::uv_tcp_bind(l.handle, addr)
+            });
+            match res {
+                0 => Ok(l.install()),
+                n => Err(UvError(n))
             }
         }
     }
+}
 
-    pub fn connect(&mut self, address: SocketAddr, cb: ConnectionCallback) {
-        unsafe {
-            assert!(self.get_watcher_data().connect_cb.is_none());
-            self.get_watcher_data().connect_cb = Some(cb);
+impl HomingIO for TcpListener {
+    fn home<'r>(&'r mut self) -> &'r mut SchedHandle { &mut self.home }
+}
 
-            let connect_handle = ConnectRequest::new().native_handle();
-            uvdebug!("connect_t: {}", connect_handle);
-            do socket_addr_as_uv_socket_addr(address) |addr| {
-                let result = match addr {
-                    UvIpv4SocketAddr(addr) => uvll::tcp_connect(connect_handle,
-                                                      self.native_handle(), addr, connect_cb),
-                    UvIpv6SocketAddr(addr) => uvll::tcp_connect6(connect_handle,
-                                                       self.native_handle(), addr, connect_cb),
-                };
-                assert_eq!(0, result);
-            }
+impl UvHandle<uvll::uv_tcp_t> for TcpListener {
+    fn uv_handle(&self) -> *uvll::uv_tcp_t { self.handle }
+}
 
-            extern fn connect_cb(req: *uvll::uv_connect_t, status: c_int) {
-                uvdebug!("connect_t: {}", req);
-                let connect_request: ConnectRequest = NativeHandle::from_native_handle(req);
-                let mut stream_watcher = connect_request.stream();
-                connect_request.delete();
-                let cb = stream_watcher.get_watcher_data().connect_cb.take_unwrap();
-                let status = status_to_maybe_uv_error(status);
-                cb(stream_watcher, status);
-            }
+impl rtio::RtioSocket for TcpListener {
+    fn socket_name(&mut self) -> Result<SocketAddr, IoError> {
+        let _m = self.fire_homing_missile();
+        socket_name(Tcp, self.handle)
+    }
+}
+
+impl rtio::RtioTcpListener for TcpListener {
+    fn listen(mut ~self) -> Result<~rtio::RtioTcpAcceptor, IoError> {
+        // create the acceptor object from ourselves
+        let incoming = self.outgoing.clone();
+        let mut acceptor = ~TcpAcceptor {
+            listener: self,
+            incoming: incoming,
+        };
+
+        let _m = acceptor.fire_homing_missile();
+        // XXX: the 128 backlog should be configurable
+        match unsafe { uvll::uv_listen(acceptor.listener.handle, 128, listen_cb) } {
+            0 => Ok(acceptor as ~rtio::RtioTcpAcceptor),
+            n => Err(uv_error_to_io_error(UvError(n))),
+        }
+    }
+}
+
+extern fn listen_cb(server: *uvll::uv_stream_t, status: c_int) {
+    assert!(status != uvll::ECANCELED);
+    let msg = match status {
+        0 => {
+            let loop_ = Loop::wrap(unsafe {
+                uvll::get_loop_for_uv_handle(server)
+            });
+            let client = TcpWatcher::new(&loop_);
+            assert_eq!(unsafe { uvll::uv_accept(server, client.handle) }, 0);
+            Ok(~client as ~rtio::RtioTcpStream)
         }
+        n => Err(uv_error_to_io_error(UvError(n)))
+    };
+
+    let tcp: &mut TcpListener = unsafe { UvHandle::from_uv_handle(&server) };
+    tcp.outgoing.send(msg);
+}
+
+impl Drop for TcpListener {
+    fn drop(&mut self) {
+        let _m = self.fire_homing_missile();
+        self.close();
     }
+}
+
+extern fn listener_close_cb(handle: *uvll::uv_handle_t) {
+    let tcp: &mut TcpListener = unsafe { UvHandle::from_uv_handle(&handle) };
+    unsafe { uvll::free_handle(handle) }
 
-    pub fn as_stream(&self) -> StreamWatcher {
-        NativeHandle::from_native_handle(self.native_handle() as *uvll::uv_stream_t)
+    let sched: ~Scheduler = Local::take();
+    sched.resume_blocked_task_immediately(tcp.closing_task.take_unwrap());
+}
+
+// TCP acceptors (bound servers)
+
+impl HomingIO for TcpAcceptor {
+    fn home<'r>(&'r mut self) -> &'r mut SchedHandle { self.listener.home() }
+}
+
+impl rtio::RtioSocket for TcpAcceptor {
+    fn socket_name(&mut self) -> Result<SocketAddr, IoError> {
+        let _m = self.fire_homing_missile();
+        socket_name(Tcp, self.listener.handle)
     }
 }
 
-impl NativeHandle<*uvll::uv_tcp_t> for TcpWatcher {
-    fn from_native_handle(handle: *uvll::uv_tcp_t) -> TcpWatcher {
-        TcpWatcher(handle)
+impl rtio::RtioTcpAcceptor for TcpAcceptor {
+    fn accept(&mut self) -> Result<~rtio::RtioTcpStream, IoError> {
+        let _m = self.fire_homing_missile();
+        self.incoming.recv()
     }
-    fn native_handle(&self) -> *uvll::uv_tcp_t {
-        match self { &TcpWatcher(ptr) => ptr }
+
+    fn accept_simultaneously(&mut self) -> Result<(), IoError> {
+        let _m = self.fire_homing_missile();
+        status_to_io_result(unsafe {
+            uvll::uv_tcp_simultaneous_accepts(self.listener.handle, 1)
+        })
+    }
+
+    fn dont_accept_simultaneously(&mut self) -> Result<(), IoError> {
+        let _m = self.fire_homing_missile();
+        status_to_io_result(unsafe {
+            uvll::uv_tcp_simultaneous_accepts(self.listener.handle, 0)
+        })
     }
 }
 
-pub struct UdpWatcher(*uvll::uv_udp_t);
-impl Watcher for UdpWatcher { }
+////////////////////////////////////////////////////////////////////////////////
+/// UDP implementation
+////////////////////////////////////////////////////////////////////////////////
+
+pub struct UdpWatcher {
+    handle: *uvll::uv_udp_t,
+    home: SchedHandle,
+}
 
 impl UdpWatcher {
-    pub fn new(loop_: &Loop) -> UdpWatcher {
-        unsafe {
-            let handle = malloc_handle(UV_UDP);
-            assert!(handle.is_not_null());
-            assert_eq!(0, uvll::udp_init(loop_.native_handle(), handle));
-            let mut watcher: UdpWatcher = NativeHandle::from_native_handle(handle);
-            watcher.install_watcher_data();
-            return watcher;
-        }
-    }
-
-    pub fn bind(&mut self, address: SocketAddr) -> Result<(), UvError> {
-        do socket_addr_as_uv_socket_addr(address) |addr| {
-            let result = unsafe {
-                match addr {
-                    UvIpv4SocketAddr(addr) => uvll::udp_bind(self.native_handle(), addr, 0u32),
-                    UvIpv6SocketAddr(addr) => uvll::udp_bind6(self.native_handle(), addr, 0u32),
-                }
+    pub fn bind(loop_: &Loop, address: SocketAddr)
+        -> Result<UdpWatcher, UvError>
+    {
+        do task::unkillable {
+            let udp = UdpWatcher {
+                handle: unsafe { uvll::malloc_handle(uvll::UV_UDP) },
+                home: get_handle_to_current_scheduler!(),
             };
+            assert_eq!(unsafe {
+                uvll::uv_udp_init(loop_.handle, udp.handle)
+            }, 0);
+            let result = socket_addr_as_sockaddr(address, |addr| unsafe {
+                uvll::uv_udp_bind(udp.handle, addr, 0u32)
+            });
             match result {
-                0 => Ok(()),
-                _ => Err(UvError(result)),
+                0 => Ok(udp),
+                n => Err(UvError(n)),
             }
         }
     }
+}
 
-    pub fn recv_start(&mut self, alloc: AllocCallback, cb: UdpReceiveCallback) {
-        {
-            let data = self.get_watcher_data();
-            data.alloc_cb = Some(alloc);
-            data.udp_recv_cb = Some(cb);
-        }
+impl UvHandle<uvll::uv_udp_t> for UdpWatcher {
+    fn uv_handle(&self) -> *uvll::uv_udp_t { self.handle }
+}
 
-        unsafe { uvll::udp_recv_start(self.native_handle(), alloc_cb, recv_cb); }
+impl HomingIO for UdpWatcher {
+    fn home<'r>(&'r mut self) -> &'r mut SchedHandle { &mut self.home }
+}
+
+impl rtio::RtioSocket for UdpWatcher {
+    fn socket_name(&mut self) -> Result<SocketAddr, IoError> {
+        let _m = self.fire_homing_missile();
+        socket_name(Udp, self.handle)
+    }
+}
 
-        extern fn alloc_cb(handle: *uvll::uv_udp_t, suggested_size: size_t) -> Buf {
-            let mut udp_watcher: UdpWatcher = NativeHandle::from_native_handle(handle);
-            let alloc_cb = udp_watcher.get_watcher_data().alloc_cb.get_ref();
-            return (*alloc_cb)(suggested_size as uint);
+impl rtio::RtioUdpSocket for UdpWatcher {
+    fn recvfrom(&mut self, buf: &mut [u8])
+        -> Result<(uint, SocketAddr), IoError>
+    {
+        struct Ctx {
+            task: Option<BlockedTask>,
+            buf: Option<Buf>,
+            result: Option<(ssize_t, Option<SocketAddr>)>,
         }
+        let _m = self.fire_homing_missile();
+
+        let a = match unsafe {
+            uvll::uv_udp_recv_start(self.handle, alloc_cb, recv_cb)
+        } {
+            0 => {
+                let mut cx = Ctx {
+                    task: None,
+                    buf: Some(slice_to_uv_buf(buf)),
+                    result: None,
+                };
+                do wait_until_woken_after(&mut cx.task) {
+                    unsafe { uvll::set_data_for_uv_handle(self.handle, &cx) }
+                }
+                match cx.result.take_unwrap() {
+                    (n, _) if n < 0 =>
+                        Err(uv_error_to_io_error(UvError(n as c_int))),
+                    (n, addr) => Ok((n as uint, addr.unwrap()))
+                }
+            }
+            n => Err(uv_error_to_io_error(UvError(n)))
+        };
+        return a;
+
+        extern fn alloc_cb(handle: *uvll::uv_udp_t,
+                           _suggested_size: size_t,
+                           buf: *mut Buf) {
+            unsafe {
+                let cx: &mut Ctx =
+                    cast::transmute(uvll::get_data_for_uv_handle(handle));
+                *buf = cx.buf.take().expect("recv alloc_cb called more than once")
+            }
+        }
+
+        extern fn recv_cb(handle: *uvll::uv_udp_t, nread: ssize_t, buf: *Buf,
+                          addr: *uvll::sockaddr, _flags: c_uint) {
+            assert!(nread != uvll::ECANCELED as ssize_t);
+            let cx: &mut Ctx = unsafe {
+                cast::transmute(uvll::get_data_for_uv_handle(handle))
+            };
 
-        extern fn recv_cb(handle: *uvll::uv_udp_t, nread: ssize_t, buf: Buf,
-                          addr: *uvll::sockaddr, flags: c_uint) {
             // When there's no data to read the recv callback can be a no-op.
             // This can happen if read returns EAGAIN/EWOULDBLOCK. By ignoring
             // this we just drop back to kqueue and wait for the next callback.
             if nread == 0 {
-                return;
+                cx.buf = Some(unsafe { *buf });
+                return
             }
 
-            uvdebug!("buf addr: {}", buf.base);
-            uvdebug!("buf len: {}", buf.len);
-            let mut udp_watcher: UdpWatcher = NativeHandle::from_native_handle(handle);
-            let cb = udp_watcher.get_watcher_data().udp_recv_cb.get_ref();
-            let status = status_to_maybe_uv_error(nread as c_int);
-            let addr = uv_socket_addr_to_socket_addr(sockaddr_to_UvSocketAddr(addr));
-            (*cb)(udp_watcher, nread as int, buf, addr, flags as uint, status);
-        }
-    }
-
-    pub fn recv_stop(&mut self) {
-        unsafe { uvll::udp_recv_stop(self.native_handle()); }
-    }
-
-    pub fn send(&mut self, buf: Buf, address: SocketAddr, cb: UdpSendCallback) {
-        {
-            let data = self.get_watcher_data();
-            assert!(data.udp_send_cb.is_none());
-            data.udp_send_cb = Some(cb);
-        }
+            unsafe {
+                assert_eq!(uvll::uv_udp_recv_stop(handle), 0)
+            }
 
-        let req = UdpSendRequest::new();
-        do socket_addr_as_uv_socket_addr(address) |addr| {
-            let result = unsafe {
-                match addr {
-                    UvIpv4SocketAddr(addr) => uvll::udp_send(req.native_handle(),
-                                                   self.native_handle(), [buf], addr, send_cb),
-                    UvIpv6SocketAddr(addr) => uvll::udp_send6(req.native_handle(),
-                                                    self.native_handle(), [buf], addr, send_cb),
-                }
+            let cx: &mut Ctx = unsafe {
+                cast::transmute(uvll::get_data_for_uv_handle(handle))
             };
-            assert_eq!(0, result);
-        }
+            let addr = if addr == ptr::null() {
+                None
+            } else {
+                Some(sockaddr_to_socket_addr(addr))
+            };
+            cx.result = Some((nread, addr));
 
-        extern fn send_cb(req: *uvll::uv_udp_send_t, status: c_int) {
-            let send_request: UdpSendRequest = NativeHandle::from_native_handle(req);
-            let mut udp_watcher = send_request.handle();
-            send_request.delete();
-            let cb = udp_watcher.get_watcher_data().udp_send_cb.take_unwrap();
-            let status = status_to_maybe_uv_error(status);
-            cb(udp_watcher, status);
+            let sched: ~Scheduler = Local::take();
+            sched.resume_blocked_task_immediately(cx.task.take_unwrap());
         }
     }
-}
 
-impl NativeHandle<*uvll::uv_udp_t> for UdpWatcher {
-    fn from_native_handle(handle: *uvll::uv_udp_t) -> UdpWatcher {
-        UdpWatcher(handle)
-    }
-    fn native_handle(&self) -> *uvll::uv_udp_t {
-        match self { &UdpWatcher(ptr) => ptr }
-    }
-}
+    fn sendto(&mut self, buf: &[u8], dst: SocketAddr) -> Result<(), IoError> {
+        struct Ctx { task: Option<BlockedTask>, result: c_int }
 
-// uv_connect_t is a subclass of uv_req_t
-pub struct ConnectRequest(*uvll::uv_connect_t);
-impl Request for ConnectRequest { }
+        let _m = self.fire_homing_missile();
 
-impl ConnectRequest {
+        let mut req = Request::new(uvll::UV_UDP_SEND);
+        let buf = slice_to_uv_buf(buf);
+        let result = socket_addr_as_sockaddr(dst, |dst| unsafe {
+            uvll::uv_udp_send(req.handle, self.handle, [buf], dst, send_cb)
+        });
 
-    pub fn new() -> ConnectRequest {
-        let connect_handle = unsafe { malloc_req(UV_CONNECT) };
-        assert!(connect_handle.is_not_null());
-        ConnectRequest(connect_handle as *uvll::uv_connect_t)
-    }
+        return match result {
+            0 => {
+                req.defuse(); // uv callback now owns this request
+                let mut cx = Ctx { task: None, result: 0 };
+                do wait_until_woken_after(&mut cx.task) {
+                    req.set_data(&cx);
+                }
+                match cx.result {
+                    0 => Ok(()),
+                    n => Err(uv_error_to_io_error(UvError(n)))
+                }
+            }
+            n => Err(uv_error_to_io_error(UvError(n)))
+        };
 
-    fn stream(&self) -> StreamWatcher {
-        unsafe {
-            let stream_handle = uvll::get_stream_handle_from_connect_req(self.native_handle());
-            NativeHandle::from_native_handle(stream_handle)
-        }
-    }
+        extern fn send_cb(req: *uvll::uv_udp_send_t, status: c_int) {
+            let req = Request::wrap(req);
+            assert!(status != uvll::ECANCELED);
+            let cx: &mut Ctx = unsafe { req.get_data() };
+            cx.result = status;
 
-    fn delete(self) {
-        unsafe { free_req(self.native_handle() as *c_void) }
+            let sched: ~Scheduler = Local::take();
+            sched.resume_blocked_task_immediately(cx.task.take_unwrap());
+        }
     }
-}
 
-impl NativeHandle<*uvll::uv_connect_t> for ConnectRequest {
-    fn from_native_handle(handle: *uvll:: uv_connect_t) -> ConnectRequest {
-        ConnectRequest(handle)
-    }
-    fn native_handle(&self) -> *uvll::uv_connect_t {
-        match self { &ConnectRequest(ptr) => ptr }
+    fn join_multicast(&mut self, multi: IpAddr) -> Result<(), IoError> {
+        let _m = self.fire_homing_missile();
+        status_to_io_result(unsafe {
+            do multi.to_str().with_c_str |m_addr| {
+                uvll::uv_udp_set_membership(self.handle,
+                                            m_addr, ptr::null(),
+                                            uvll::UV_JOIN_GROUP)
+            }
+        })
     }
-}
-
-pub struct WriteRequest(*uvll::uv_write_t);
-
-impl Request for WriteRequest { }
 
-impl WriteRequest {
-    pub fn new() -> WriteRequest {
-        let write_handle = unsafe { malloc_req(UV_WRITE) };
-        assert!(write_handle.is_not_null());
-        WriteRequest(write_handle as *uvll::uv_write_t)
+    fn leave_multicast(&mut self, multi: IpAddr) -> Result<(), IoError> {
+        let _m = self.fire_homing_missile();
+        status_to_io_result(unsafe {
+            do multi.to_str().with_c_str |m_addr| {
+                uvll::uv_udp_set_membership(self.handle,
+                                            m_addr, ptr::null(),
+                                            uvll::UV_LEAVE_GROUP)
+            }
+        })
     }
 
-    pub fn stream(&self) -> StreamWatcher {
-        unsafe {
-            let stream_handle = uvll::get_stream_handle_from_write_req(self.native_handle());
-            NativeHandle::from_native_handle(stream_handle)
-        }
+    fn loop_multicast_locally(&mut self) -> Result<(), IoError> {
+        let _m = self.fire_homing_missile();
+        status_to_io_result(unsafe {
+            uvll::uv_udp_set_multicast_loop(self.handle,
+                                            1 as c_int)
+        })
     }
 
-    pub fn delete(self) {
-        unsafe { free_req(self.native_handle() as *c_void) }
+    fn dont_loop_multicast_locally(&mut self) -> Result<(), IoError> {
+        let _m = self.fire_homing_missile();
+        status_to_io_result(unsafe {
+            uvll::uv_udp_set_multicast_loop(self.handle,
+                                            0 as c_int)
+        })
     }
-}
 
-impl NativeHandle<*uvll::uv_write_t> for WriteRequest {
-    fn from_native_handle(handle: *uvll:: uv_write_t) -> WriteRequest {
-        WriteRequest(handle)
-    }
-    fn native_handle(&self) -> *uvll::uv_write_t {
-        match self { &WriteRequest(ptr) => ptr }
+    fn multicast_time_to_live(&mut self, ttl: int) -> Result<(), IoError> {
+        let _m = self.fire_homing_missile();
+        status_to_io_result(unsafe {
+            uvll::uv_udp_set_multicast_ttl(self.handle,
+                                           ttl as c_int)
+        })
     }
-}
-
-pub struct UdpSendRequest(*uvll::uv_udp_send_t);
-impl Request for UdpSendRequest { }
 
-impl UdpSendRequest {
-    pub fn new() -> UdpSendRequest {
-        let send_handle = unsafe { malloc_req(UV_UDP_SEND) };
-        assert!(send_handle.is_not_null());
-        UdpSendRequest(send_handle as *uvll::uv_udp_send_t)
+    fn time_to_live(&mut self, ttl: int) -> Result<(), IoError> {
+        let _m = self.fire_homing_missile();
+        status_to_io_result(unsafe {
+            uvll::uv_udp_set_ttl(self.handle, ttl as c_int)
+        })
     }
 
-    pub fn handle(&self) -> UdpWatcher {
-        let send_request_handle = unsafe {
-            uvll::get_udp_handle_from_send_req(self.native_handle())
-        };
-        NativeHandle::from_native_handle(send_request_handle)
+    fn hear_broadcasts(&mut self) -> Result<(), IoError> {
+        let _m = self.fire_homing_missile();
+        status_to_io_result(unsafe {
+            uvll::uv_udp_set_broadcast(self.handle,
+                                       1 as c_int)
+        })
     }
 
-    pub fn delete(self) {
-        unsafe { free_req(self.native_handle() as *c_void) }
+    fn ignore_broadcasts(&mut self) -> Result<(), IoError> {
+        let _m = self.fire_homing_missile();
+        status_to_io_result(unsafe {
+            uvll::uv_udp_set_broadcast(self.handle,
+                                       0 as c_int)
+        })
     }
 }
 
-impl NativeHandle<*uvll::uv_udp_send_t> for UdpSendRequest {
-    fn from_native_handle(handle: *uvll::uv_udp_send_t) -> UdpSendRequest {
-        UdpSendRequest(handle)
-    }
-    fn native_handle(&self) -> *uvll::uv_udp_send_t {
-        match self { &UdpSendRequest(ptr) => ptr }
+impl Drop for UdpWatcher {
+    fn drop(&mut self) {
+        // Send ourselves home to close this handle (blocking while doing so).
+        let _m = self.fire_homing_missile();
+        self.close();
     }
 }
 
+////////////////////////////////////////////////////////////////////////////////
+/// UV request support
+////////////////////////////////////////////////////////////////////////////////
+
 #[cfg(test)]
 mod test {
-    use super::*;
-    use std::util::ignore;
     use std::cell::Cell;
-    use std::vec;
-    use std::unstable::run_in_bare_thread;
-    use std::rt::thread::Thread;
+    use std::comm::oneshot;
     use std::rt::test::*;
-    use super::super::{Loop, AllocCallback};
-    use super::super::{vec_from_uv_buf, vec_to_uv_buf, slice_to_uv_buf};
+    use std::rt::rtio::{RtioTcpStream, RtioTcpListener, RtioTcpAcceptor,
+                        RtioUdpSocket};
+    use std::task;
+
+    use super::*;
+    use super::super::local_loop;
 
     #[test]
     fn connect_close_ip4() {
-        do run_in_bare_thread() {
-            let mut loop_ = Loop::new();
-            let mut tcp_watcher = { TcpWatcher::new(&mut loop_) };
-            // Connect to a port where nobody is listening
-            let addr = next_test_ip4();
-            do tcp_watcher.connect(addr) |stream_watcher, status| {
-                uvdebug!("tcp_watcher.connect!");
-                assert!(status.is_some());
-                assert_eq!(status.unwrap().name(), ~"ECONNREFUSED");
-                stream_watcher.close(||());
-            }
-            loop_.run();
-            loop_.close();
+        match TcpWatcher::connect(local_loop(), next_test_ip4()) {
+            Ok(*) => fail!(),
+            Err(e) => assert_eq!(e.name(), ~"ECONNREFUSED"),
         }
     }
 
     #[test]
     fn connect_close_ip6() {
-        do run_in_bare_thread() {
-            let mut loop_ = Loop::new();
-            let mut tcp_watcher = { TcpWatcher::new(&mut loop_) };
-            // Connect to a port where nobody is listening
-            let addr = next_test_ip6();
-            do tcp_watcher.connect(addr) |stream_watcher, status| {
-                uvdebug!("tcp_watcher.connect!");
-                assert!(status.is_some());
-                assert_eq!(status.unwrap().name(), ~"ECONNREFUSED");
-                stream_watcher.close(||());
-            }
-            loop_.run();
-            loop_.close();
+        match TcpWatcher::connect(local_loop(), next_test_ip6()) {
+            Ok(*) => fail!(),
+            Err(e) => assert_eq!(e.name(), ~"ECONNREFUSED"),
         }
     }
 
     #[test]
     fn udp_bind_close_ip4() {
-        do run_in_bare_thread() {
-            let mut loop_ = Loop::new();
-            let mut udp_watcher = { UdpWatcher::new(&mut loop_) };
-            let addr = next_test_ip4();
-            udp_watcher.bind(addr);
-            udp_watcher.close(||());
-            loop_.run();
-            loop_.close();
+        match UdpWatcher::bind(local_loop(), next_test_ip4()) {
+            Ok(*) => {}
+            Err(*) => fail!()
         }
     }
 
     #[test]
     fn udp_bind_close_ip6() {
-        do run_in_bare_thread() {
-            let mut loop_ = Loop::new();
-            let mut udp_watcher = { UdpWatcher::new(&mut loop_) };
-            let addr = next_test_ip6();
-            udp_watcher.bind(addr);
-            udp_watcher.close(||());
-            loop_.run();
-            loop_.close();
+        match UdpWatcher::bind(local_loop(), next_test_ip6()) {
+            Ok(*) => {}
+            Err(*) => fail!()
         }
     }
 
     #[test]
     fn listen_ip4() {
-        do run_in_bare_thread() {
-            static MAX: int = 10;
-            let mut loop_ = Loop::new();
-            let mut server_tcp_watcher = { TcpWatcher::new(&mut loop_) };
-            let addr = next_test_ip4();
-            server_tcp_watcher.bind(addr);
-            let loop_ = loop_;
-            uvdebug!("listening");
-            let mut stream = server_tcp_watcher.as_stream();
-            let res = do stream.listen |mut server_stream_watcher, status| {
-                uvdebug!("listened!");
-                assert!(status.is_none());
-                let mut loop_ = loop_;
-                let client_tcp_watcher = TcpWatcher::new(&mut loop_);
-                let mut client_tcp_watcher = client_tcp_watcher.as_stream();
-                server_stream_watcher.accept(client_tcp_watcher);
-                let count_cell = Cell::new(0);
-                let server_stream_watcher = server_stream_watcher;
-                uvdebug!("starting read");
-                let alloc: AllocCallback = |size| {
-                    vec_to_uv_buf(vec::from_elem(size, 0u8))
-                };
-                do client_tcp_watcher.read_start(alloc) |stream_watcher, nread, buf, status| {
-
-                    uvdebug!("i'm reading!");
-                    let buf = vec_from_uv_buf(buf);
-                    let mut count = count_cell.take();
-                    if status.is_none() {
-                        uvdebug!("got {} bytes", nread);
-                        let buf = buf.unwrap();
-                        for byte in buf.slice(0, nread as uint).iter() {
-                            assert!(*byte == count as u8);
-                            uvdebug!("{}", *byte as uint);
-                            count += 1;
-                        }
-                    } else {
-                        assert_eq!(count, MAX);
-                        do stream_watcher.close {
-                            server_stream_watcher.close(||());
-                        }
+        let (port, chan) = oneshot();
+        let chan = Cell::new(chan);
+        let addr = next_test_ip4();
+
+        do spawn {
+            let w = match TcpListener::bind(local_loop(), addr) {
+                Ok(w) => w, Err(e) => fail!("{:?}", e)
+            };
+            let mut w = match w.listen() {
+                Ok(w) => w, Err(e) => fail!("{:?}", e),
+            };
+            chan.take().send(());
+            match w.accept() {
+                Ok(mut stream) => {
+                    let mut buf = [0u8, ..10];
+                    match stream.read(buf) {
+                        Ok(10) => {} e => fail!("{:?}", e),
+                    }
+                    for i in range(0, 10u8) {
+                        assert_eq!(buf[i], i + 1);
                     }
-                    count_cell.put_back(count);
                 }
-            };
+                Err(e) => fail!("{:?}", e)
+            }
+        }
 
-            assert!(res.is_ok());
-
-            let client_thread = do Thread::start {
-                uvdebug!("starting client thread");
-                let mut loop_ = Loop::new();
-                let mut tcp_watcher = { TcpWatcher::new(&mut loop_) };
-                do tcp_watcher.connect(addr) |mut stream_watcher, status| {
-                    uvdebug!("connecting");
-                    assert!(status.is_none());
-                    let msg = ~[0, 1, 2, 3, 4, 5, 6 ,7 ,8, 9];
-                    let buf = slice_to_uv_buf(msg);
-                    let msg_cell = Cell::new(msg);
-                    do stream_watcher.write(buf) |stream_watcher, status| {
-                        uvdebug!("writing");
-                        assert!(status.is_none());
-                        let msg_cell = Cell::new(msg_cell.take());
-                        stream_watcher.close(||ignore(msg_cell.take()));
+        port.recv();
+        let mut w = match TcpWatcher::connect(local_loop(), addr) {
+            Ok(w) => w, Err(e) => fail!("{:?}", e)
+        };
+        match w.write([1, 2, 3, 4, 5, 6, 7, 8, 9, 10]) {
+            Ok(()) => {}, Err(e) => fail!("{:?}", e)
+        }
+    }
+
+    #[test]
+    fn listen_ip6() {
+        let (port, chan) = oneshot();
+        let chan = Cell::new(chan);
+        let addr = next_test_ip6();
+
+        do spawn {
+            let w = match TcpListener::bind(local_loop(), addr) {
+                Ok(w) => w, Err(e) => fail!("{:?}", e)
+            };
+            let mut w = match w.listen() {
+                Ok(w) => w, Err(e) => fail!("{:?}", e),
+            };
+            chan.take().send(());
+            match w.accept() {
+                Ok(mut stream) => {
+                    let mut buf = [0u8, ..10];
+                    match stream.read(buf) {
+                        Ok(10) => {} e => fail!("{:?}", e),
+                    }
+                    for i in range(0, 10u8) {
+                        assert_eq!(buf[i], i + 1);
                     }
                 }
-                loop_.run();
-                loop_.close();
-            };
+                Err(e) => fail!("{:?}", e)
+            }
+        }
 
-            let mut loop_ = loop_;
-            loop_.run();
-            loop_.close();
-            client_thread.join();
+        port.recv();
+        let mut w = match TcpWatcher::connect(local_loop(), addr) {
+            Ok(w) => w, Err(e) => fail!("{:?}", e)
         };
+        match w.write([1, 2, 3, 4, 5, 6, 7, 8, 9, 10]) {
+            Ok(()) => {}, Err(e) => fail!("{:?}", e)
+        }
     }
 
     #[test]
-    fn listen_ip6() {
-        do run_in_bare_thread() {
-            static MAX: int = 10;
-            let mut loop_ = Loop::new();
-            let mut server_tcp_watcher = { TcpWatcher::new(&mut loop_) };
-            let addr = next_test_ip6();
-            server_tcp_watcher.bind(addr);
-            let loop_ = loop_;
-            uvdebug!("listening");
-            let mut stream = server_tcp_watcher.as_stream();
-            let res = do stream.listen |mut server_stream_watcher, status| {
-                uvdebug!("listened!");
-                assert!(status.is_none());
-                let mut loop_ = loop_;
-                let client_tcp_watcher = TcpWatcher::new(&mut loop_);
-                let mut client_tcp_watcher = client_tcp_watcher.as_stream();
-                server_stream_watcher.accept(client_tcp_watcher);
-                let count_cell = Cell::new(0);
-                let server_stream_watcher = server_stream_watcher;
-                uvdebug!("starting read");
-                let alloc: AllocCallback = |size| {
-                    vec_to_uv_buf(vec::from_elem(size, 0u8))
-                };
-                do client_tcp_watcher.read_start(alloc)
-                    |stream_watcher, nread, buf, status| {
-
-                    uvdebug!("i'm reading!");
-                    let buf = vec_from_uv_buf(buf);
-                    let mut count = count_cell.take();
-                    if status.is_none() {
-                        uvdebug!("got {} bytes", nread);
-                        let buf = buf.unwrap();
-                        let r = buf.slice(0, nread as uint);
-                        for byte in r.iter() {
-                            assert!(*byte == count as u8);
-                            uvdebug!("{}", *byte as uint);
-                            count += 1;
-                        }
-                    } else {
-                        assert_eq!(count, MAX);
-                        do stream_watcher.close {
-                            server_stream_watcher.close(||());
-                        }
+    fn udp_recv_ip4() {
+        let (port, chan) = oneshot();
+        let chan = Cell::new(chan);
+        let client = next_test_ip4();
+        let server = next_test_ip4();
+
+        do spawn {
+            match UdpWatcher::bind(local_loop(), server) {
+                Ok(mut w) => {
+                    chan.take().send(());
+                    let mut buf = [0u8, ..10];
+                    match w.recvfrom(buf) {
+                        Ok((10, addr)) => assert_eq!(addr, client),
+                        e => fail!("{:?}", e),
+                    }
+                    for i in range(0, 10u8) {
+                        assert_eq!(buf[i], i + 1);
                     }
-                    count_cell.put_back(count);
                 }
-            };
-            assert!(res.is_ok());
-
-            let client_thread = do Thread::start {
-                uvdebug!("starting client thread");
-                let mut loop_ = Loop::new();
-                let mut tcp_watcher = { TcpWatcher::new(&mut loop_) };
-                do tcp_watcher.connect(addr) |mut stream_watcher, status| {
-                    uvdebug!("connecting");
-                    assert!(status.is_none());
-                    let msg = ~[0, 1, 2, 3, 4, 5, 6 ,7 ,8, 9];
-                    let buf = slice_to_uv_buf(msg);
-                    let msg_cell = Cell::new(msg);
-                    do stream_watcher.write(buf) |stream_watcher, status| {
-                        uvdebug!("writing");
-                        assert!(status.is_none());
-                        let msg_cell = Cell::new(msg_cell.take());
-                        stream_watcher.close(||ignore(msg_cell.take()));
+                Err(e) => fail!("{:?}", e)
+            }
+        }
+
+        port.recv();
+        let mut w = match UdpWatcher::bind(local_loop(), client) {
+            Ok(w) => w, Err(e) => fail!("{:?}", e)
+        };
+        match w.sendto([1, 2, 3, 4, 5, 6, 7, 8, 9, 10], server) {
+            Ok(()) => {}, Err(e) => fail!("{:?}", e)
+        }
+    }
+
+    #[test]
+    fn udp_recv_ip6() {
+        let (port, chan) = oneshot();
+        let chan = Cell::new(chan);
+        let client = next_test_ip6();
+        let server = next_test_ip6();
+
+        do spawn {
+            match UdpWatcher::bind(local_loop(), server) {
+                Ok(mut w) => {
+                    chan.take().send(());
+                    let mut buf = [0u8, ..10];
+                    match w.recvfrom(buf) {
+                        Ok((10, addr)) => assert_eq!(addr, client),
+                        e => fail!("{:?}", e),
+                    }
+                    for i in range(0, 10u8) {
+                        assert_eq!(buf[i], i + 1);
                     }
                 }
-                loop_.run();
-                loop_.close();
-            };
+                Err(e) => fail!("{:?}", e)
+            }
+        }
 
-            let mut loop_ = loop_;
-            loop_.run();
-            loop_.close();
-            client_thread.join();
+        port.recv();
+        let mut w = match UdpWatcher::bind(local_loop(), client) {
+            Ok(w) => w, Err(e) => fail!("{:?}", e)
+        };
+        match w.sendto([1, 2, 3, 4, 5, 6, 7, 8, 9, 10], server) {
+            Ok(()) => {}, Err(e) => fail!("{:?}", e)
         }
     }
 
     #[test]
-    fn udp_recv_ip4() {
-        do run_in_bare_thread() {
-            static MAX: int = 10;
-            let mut loop_ = Loop::new();
-            let server_addr = next_test_ip4();
-            let client_addr = next_test_ip4();
-
-            let mut server = UdpWatcher::new(&loop_);
-            assert!(server.bind(server_addr).is_ok());
-
-            uvdebug!("starting read");
-            let alloc: AllocCallback = |size| {
-                vec_to_uv_buf(vec::from_elem(size, 0u8))
-            };
+    fn test_read_read_read() {
+        use std::rt::rtio::*;
+        let addr = next_test_ip4();
+        static MAX: uint = 5000;
+        let (port, chan) = oneshot();
+        let port = Cell::new(port);
+        let chan = Cell::new(chan);
+
+        do spawn {
+            let listener = TcpListener::bind(local_loop(), addr).unwrap();
+            let mut acceptor = listener.listen().unwrap();
+            chan.take().send(());
+            let mut stream = acceptor.accept().unwrap();
+            let buf = [1, .. 2048];
+            let mut total_bytes_written = 0;
+            while total_bytes_written < MAX {
+                assert!(stream.write(buf).is_ok());
+                uvdebug!("wrote bytes");
+                total_bytes_written += buf.len();
+            }
+        }
 
-            do server.recv_start(alloc) |mut server, nread, buf, src, flags, status| {
-                server.recv_stop();
-                uvdebug!("i'm reading!");
-                assert!(status.is_none());
-                assert_eq!(flags, 0);
-                assert_eq!(src, client_addr);
-
-                let buf = vec_from_uv_buf(buf);
-                let mut count = 0;
-                uvdebug!("got {} bytes", nread);
-
-                let buf = buf.unwrap();
-                for &byte in buf.slice(0, nread as uint).iter() {
-                    assert!(byte == count as u8);
-                    uvdebug!("{}", byte as uint);
-                    count += 1;
+        do spawn {
+            port.take().recv();
+            let mut stream = TcpWatcher::connect(local_loop(), addr).unwrap();
+            let mut buf = [0, .. 2048];
+            let mut total_bytes_read = 0;
+            while total_bytes_read < MAX {
+                let nread = stream.read(buf).unwrap();
+                total_bytes_read += nread;
+                for i in range(0u, nread) {
+                    assert_eq!(buf[i], 1);
                 }
-                assert_eq!(count, MAX);
+            }
+            uvdebug!("read {} bytes total", total_bytes_read);
+        }
+    }
+
+    #[test]
+    #[ignore(cfg(windows))] // FIXME(#10102) server never sees second packet
+    fn test_udp_twice() {
+        let server_addr = next_test_ip4();
+        let client_addr = next_test_ip4();
+        let (port, chan) = oneshot();
+        let port = Cell::new(port);
+        let chan = Cell::new(chan);
+
+        do spawn {
+            let mut client = UdpWatcher::bind(local_loop(), client_addr).unwrap();
+            port.take().recv();
+            assert!(client.sendto([1], server_addr).is_ok());
+            assert!(client.sendto([2], server_addr).is_ok());
+        }
 
-                server.close(||{});
+        let mut server = UdpWatcher::bind(local_loop(), server_addr).unwrap();
+        chan.take().send(());
+        let mut buf1 = [0];
+        let mut buf2 = [0];
+        let (nread1, src1) = server.recvfrom(buf1).unwrap();
+        let (nread2, src2) = server.recvfrom(buf2).unwrap();
+        assert_eq!(nread1, 1);
+        assert_eq!(nread2, 1);
+        assert_eq!(src1, client_addr);
+        assert_eq!(src2, client_addr);
+        assert_eq!(buf1[0], 1);
+        assert_eq!(buf2[0], 2);
+    }
+
+    #[test]
+    fn test_udp_many_read() {
+        let server_out_addr = next_test_ip4();
+        let server_in_addr = next_test_ip4();
+        let client_out_addr = next_test_ip4();
+        let client_in_addr = next_test_ip4();
+        static MAX: uint = 500_000;
+
+        let (p1, c1) = oneshot();
+        let (p2, c2) = oneshot();
+
+        let first = Cell::new((p1, c2));
+        let second = Cell::new((p2, c1));
+
+        do spawn {
+            let l = local_loop();
+            let mut server_out = UdpWatcher::bind(l, server_out_addr).unwrap();
+            let mut server_in = UdpWatcher::bind(l, server_in_addr).unwrap();
+            let (port, chan) = first.take();
+            chan.send(());
+            port.recv();
+            let msg = [1, .. 2048];
+            let mut total_bytes_sent = 0;
+            let mut buf = [1];
+            while buf[0] == 1 {
+                // send more data
+                assert!(server_out.sendto(msg, client_in_addr).is_ok());
+                total_bytes_sent += msg.len();
+                // check if the client has received enough
+                let res = server_in.recvfrom(buf);
+                assert!(res.is_ok());
+                let (nread, src) = res.unwrap();
+                assert_eq!(nread, 1);
+                assert_eq!(src, client_out_addr);
             }
+            assert!(total_bytes_sent >= MAX);
+        }
 
-            let thread = do Thread::start {
-                let mut loop_ = Loop::new();
-                let mut client = UdpWatcher::new(&loop_);
-                assert!(client.bind(client_addr).is_ok());
-                let msg = ~[0, 1, 2, 3, 4, 5, 6, 7, 8, 9];
-                let buf = slice_to_uv_buf(msg);
-                do client.send(buf, server_addr) |client, status| {
-                    uvdebug!("writing");
-                    assert!(status.is_none());
-                    client.close(||{});
+        do spawn {
+            let l = local_loop();
+            let mut client_out = UdpWatcher::bind(l, client_out_addr).unwrap();
+            let mut client_in = UdpWatcher::bind(l, client_in_addr).unwrap();
+            let (port, chan) = second.take();
+            port.recv();
+            chan.send(());
+            let mut total_bytes_recv = 0;
+            let mut buf = [0, .. 2048];
+            while total_bytes_recv < MAX {
+                // ask for more
+                assert!(client_out.sendto([1], server_in_addr).is_ok());
+                // wait for data
+                let res = client_in.recvfrom(buf);
+                assert!(res.is_ok());
+                let (nread, src) = res.unwrap();
+                assert_eq!(src, server_out_addr);
+                total_bytes_recv += nread;
+                for i in range(0u, nread) {
+                    assert_eq!(buf[i], 1);
                 }
+            }
+            // tell the server we're done
+            assert!(client_out.sendto([0], server_in_addr).is_ok());
+        }
+    }
 
-                loop_.run();
-                loop_.close();
-            };
+    #[test]
+    fn test_read_and_block() {
+        let addr = next_test_ip4();
+        let (port, chan) = oneshot();
+        let port = Cell::new(port);
+        let chan = Cell::new(chan);
+
+        do spawn {
+            let listener = TcpListener::bind(local_loop(), addr).unwrap();
+            let mut acceptor = listener.listen().unwrap();
+            let (port2, chan2) = stream();
+            chan.take().send(port2);
+            let mut stream = acceptor.accept().unwrap();
+            let mut buf = [0, .. 2048];
+
+            let expected = 32;
+            let mut current = 0;
+            let mut reads = 0;
+
+            while current < expected {
+                let nread = stream.read(buf).unwrap();
+                for i in range(0u, nread) {
+                    let val = buf[i] as uint;
+                    assert_eq!(val, current % 8);
+                    current += 1;
+                }
+                reads += 1;
+
+                chan2.send(());
+            }
+
+            // Make sure we had multiple reads
+            assert!(reads > 1);
+        }
 
-            loop_.run();
-            loop_.close();
-            thread.join();
+        do spawn {
+            let port2 = port.take().recv();
+            let mut stream = TcpWatcher::connect(local_loop(), addr).unwrap();
+            stream.write([0, 1, 2, 3, 4, 5, 6, 7]);
+            stream.write([0, 1, 2, 3, 4, 5, 6, 7]);
+            port2.recv();
+            stream.write([0, 1, 2, 3, 4, 5, 6, 7]);
+            stream.write([0, 1, 2, 3, 4, 5, 6, 7]);
+            port2.recv();
         }
     }
 
     #[test]
-    fn udp_recv_ip6() {
-        do run_in_bare_thread() {
-            static MAX: int = 10;
-            let mut loop_ = Loop::new();
-            let server_addr = next_test_ip6();
-            let client_addr = next_test_ip6();
-
-            let mut server = UdpWatcher::new(&loop_);
-            assert!(server.bind(server_addr).is_ok());
-
-            uvdebug!("starting read");
-            let alloc: AllocCallback = |size| {
-                vec_to_uv_buf(vec::from_elem(size, 0u8))
+    fn test_simple_tcp_server_and_client_on_diff_threads() {
+        let addr = next_test_ip4();
+
+        do task::spawn_sched(task::SingleThreaded) {
+            let listener = TcpListener::bind(local_loop(), addr).unwrap();
+            let mut acceptor = listener.listen().unwrap();
+            let mut stream = acceptor.accept().unwrap();
+            let mut buf = [0, .. 2048];
+            let nread = stream.read(buf).unwrap();
+            assert_eq!(nread, 8);
+            for i in range(0u, nread) {
+                assert_eq!(buf[i], i as u8);
+            }
+        }
+
+        do task::spawn_sched(task::SingleThreaded) {
+            let mut stream = TcpWatcher::connect(local_loop(), addr);
+            while stream.is_err() {
+                stream = TcpWatcher::connect(local_loop(), addr);
+            }
+            stream.unwrap().write([0, 1, 2, 3, 4, 5, 6, 7]);
+        }
+    }
+
+    // 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) = oneshot();
+        let port = Cell::new(port);
+        let chan = Cell::new(chan);
+
+        do task::spawn_sched(task::SingleThreaded) {
+            let chan = Cell::new(chan.take());
+            let listener = UdpWatcher::bind(local_loop(), next_test_ip4()).unwrap();
+            chan.take().send(listener);
+        }
+
+        do task::spawn_sched(task::SingleThreaded) {
+            let port = Cell::new(port.take());
+            port.take().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::work_queue::WorkQueue;
+        use std::unstable::run_in_bare_thread;
+        use uvio::UvEventLoop;
+
+        do run_in_bare_thread {
+            let sleepers = SleeperList::new();
+            let work_queue1 = WorkQueue::new();
+            let work_queue2 = WorkQueue::new();
+            let queues = ~[work_queue1.clone(), work_queue2.clone()];
+
+            let loop1 = ~UvEventLoop::new() as ~EventLoop;
+            let mut sched1 = ~Scheduler::new(loop1, work_queue1, queues.clone(),
+                                             sleepers.clone());
+            let loop2 = ~UvEventLoop::new() as ~EventLoop;
+            let mut sched2 = ~Scheduler::new(loop2, work_queue2, queues.clone(),
+                                             sleepers.clone());
+
+            let handle1 = Cell::new(sched1.make_handle());
+            let handle2 = Cell::new(sched2.make_handle());
+            let tasksFriendHandle = Cell::new(sched2.make_handle());
+
+            let on_exit: ~fn(UnwindResult) = |exit_status| {
+                handle1.take().send(Shutdown);
+                handle2.take().send(Shutdown);
+                assert!(exit_status.is_success());
             };
 
-            do server.recv_start(alloc) |mut server, nread, buf, src, flags, status| {
-                server.recv_stop();
-                uvdebug!("i'm reading!");
-                assert!(status.is_none());
-                assert_eq!(flags, 0);
-                assert_eq!(src, client_addr);
-
-                let buf = vec_from_uv_buf(buf);
-                let mut count = 0;
-                uvdebug!("got {} bytes", nread);
-
-                let buf = buf.unwrap();
-                for &byte in buf.slice(0, nread as uint).iter() {
-                    assert!(byte == count as u8);
-                    uvdebug!("{}", byte as uint);
-                    count += 1;
+            unsafe fn local_io() -> &'static mut IoFactory {
+                do Local::borrow |sched: &mut Scheduler| {
+                    let mut io = None;
+                    sched.event_loop.io(|i| io = Some(i));
+                    cast::transmute(io.unwrap())
                 }
-                assert_eq!(count, MAX);
-
-                server.close(||{});
             }
 
-            let thread = do Thread::start {
-                let mut loop_ = Loop::new();
-                let mut client = UdpWatcher::new(&loop_);
-                assert!(client.bind(client_addr).is_ok());
-                let msg = ~[0, 1, 2, 3, 4, 5, 6, 7, 8, 9];
-                let buf = slice_to_uv_buf(msg);
-                do client.send(buf, server_addr) |client, status| {
-                    uvdebug!("writing");
-                    assert!(status.is_none());
-                    client.close(||{});
+            let test_function: ~fn() = || {
+                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
+                do task::unkillable { // FIXME(#8674)
+                    let scheduler: ~Scheduler = Local::take();
+                    do scheduler.deschedule_running_task_and_then |_, task| {
+                        // unblock task
+                        do task.wake().map |task| {
+                            // send self to sched2
+                            tasksFriendHandle.take().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
+            };
 
-                loop_.run();
-                loop_.close();
+            let mut main_task = ~Task::new_root(&mut sched1.stack_pool, None,
+                                                test_function);
+            main_task.death.on_exit = Some(on_exit);
+            let main_task = Cell::new(main_task);
+
+            let null_task = Cell::new(~do Task::new_root(&mut sched2.stack_pool,
+                                                         None) || {});
+
+            let sched1 = Cell::new(sched1);
+            let sched2 = Cell::new(sched2);
+
+            let thread1 = do Thread::start {
+                sched1.take().bootstrap(main_task.take());
+            };
+            let thread2 = do Thread::start {
+                sched2.take().bootstrap(null_task.take());
             };
 
-            loop_.run();
-            loop_.close();
-            thread.join();
+            thread1.join();
+            thread2.join();
+        }
+    }
+
+    #[should_fail] #[test]
+    fn tcp_listener_fail_cleanup() {
+        let addr = next_test_ip4();
+        let w = TcpListener::bind(local_loop(), addr).unwrap();
+        let _w = w.listen().unwrap();
+        fail!();
+    }
+
+    #[should_fail] #[test]
+    fn tcp_stream_fail_cleanup() {
+        let (port, chan) = oneshot();
+        let chan = Cell::new(chan);
+        let addr = next_test_ip4();
+
+        do task::spawn_unlinked { // please no linked failure
+            let w = TcpListener::bind(local_loop(), addr).unwrap();
+            let mut w = w.listen().unwrap();
+            chan.take().send(());
+            w.accept();
+        }
+        port.recv();
+        let _w = TcpWatcher::connect(local_loop(), addr).unwrap();
+        fail!();
+    }
+
+    #[should_fail] #[test]
+    fn udp_listener_fail_cleanup() {
+        let addr = next_test_ip4();
+        let _w = UdpWatcher::bind(local_loop(), addr).unwrap();
+        fail!();
+    }
+
+    #[should_fail] #[test]
+    fn udp_fail_other_task() {
+        let addr = next_test_ip4();
+        let (port, chan) = oneshot();
+        let chan = Cell::new(chan);
+
+        // force the handle to be created on a different scheduler, failure in
+        // the original task will force a homing operation back to this
+        // scheduler.
+        do task::spawn_sched(task::SingleThreaded) {
+            let w = UdpWatcher::bind(local_loop(), addr).unwrap();
+            chan.take().send(w);
+        }
+
+        let _w = port.recv();
+        fail!();
+    }
+
+    #[should_fail]
+    #[test]
+    #[ignore(reason = "linked failure")]
+    fn linked_failure1() {
+        let (port, chan) = oneshot();
+        let chan = Cell::new(chan);
+        let addr = next_test_ip4();
+
+        do spawn {
+            let w = TcpListener::bind(local_loop(), addr).unwrap();
+            let mut w = w.listen().unwrap();
+            chan.take().send(());
+            w.accept();
+        }
+
+        port.recv();
+        fail!();
+    }
+
+    #[should_fail]
+    #[test]
+    #[ignore(reason = "linked failure")]
+    fn linked_failure2() {
+        let (port, chan) = oneshot();
+        let chan = Cell::new(chan);
+        let addr = next_test_ip4();
+
+        do spawn {
+            let w = TcpListener::bind(local_loop(), addr).unwrap();
+            let mut w = w.listen().unwrap();
+            chan.take().send(());
+            let mut buf = [0];
+            w.accept().unwrap().read(buf);
         }
+
+        port.recv();
+        let _w = TcpWatcher::connect(local_loop(), addr).unwrap();
+
+        fail!();
+    }
+
+    #[should_fail]
+    #[test]
+    #[ignore(reason = "linked failure")]
+    fn linked_failure3() {
+        let (port, chan) = stream();
+        let chan = Cell::new(chan);
+        let addr = next_test_ip4();
+
+        do spawn {
+            let chan = chan.take();
+            let w = TcpListener::bind(local_loop(), addr).unwrap();
+            let mut w = w.listen().unwrap();
+            chan.send(());
+            let mut conn = w.accept().unwrap();
+            chan.send(());
+            let buf = [0, ..65536];
+            conn.write(buf);
+        }
+
+        port.recv();
+        let _w = TcpWatcher::connect(local_loop(), addr).unwrap();
+        port.recv();
+        fail!();
     }
 }