---

yaml
---
r: 61357
b: refs/heads/try
c: 174ec1e
h: refs/heads/master
i:
  61355: 2f6e35f
v: v3

Author: brson

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: 2d28d645422c1617be58c8ca7ad9a457264ca850
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 2d28d645422c1617be58c8ca7ad9a457264ca850
-refs/heads/try: 0a54bad3d1d306845b04f146c2c31d4a70e9ede3
+refs/heads/try: 174ec1e42252c46cc6722296379968ba7a6c6fbd
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/src/libcore/macros.rs

@@ -11,7 +11,7 @@
 #[macro_escape];
 
 // Some basic logging
-macro_rules! rtdebug_ (
+macro_rules! rtdebug (
     ($( $arg:expr),+) => ( {
         dumb_println(fmt!( $($arg),+ ));
 
@@ -26,7 +26,7 @@ macro_rules! rtdebug_ (
 )
 
 // An alternate version with no output, for turning off logging
-macro_rules! rtdebug (
+macro_rules! rtdebug_ (
     ($( $arg:expr),+) => ( $(let _ = $arg)*; )
 )
 

branches/try/src/libcore/rt/io/mod.rs

@@ -338,6 +338,7 @@ pub enum IoErrorKind {
     ConnectionFailed,
     Closed,
     ConnectionRefused,
+    ConnectionReset
 }
 
 // XXX: Can't put doc comments on macros

branches/try/src/libcore/rt/io/net/tcp.rs

@@ -13,7 +13,7 @@ use result::{Ok, Err};
 use rt::sched::local_sched::unsafe_borrow_io;
 use rt::io::net::ip::IpAddr;
 use rt::io::{Reader, Writer, Listener};
-use rt::io::io_error;
+use rt::io::{io_error, EndOfFile};
 use rt::rtio::{IoFactory,
                RtioTcpListener, RtioTcpListenerObject,
                RtioTcpStream, RtioTcpStreamObject};
@@ -55,8 +55,12 @@ impl Reader for TcpStream {
         let bytes_read = self.rtstream.read(buf);
         match bytes_read {
             Ok(read) => Some(read),
-            Err(_) => {
-                abort!("XXX");
+            Err(ioerr) => {
+                // EOF is indicated by returning None
+                if ioerr.kind != EndOfFile {
+                    io_error::cond.raise(ioerr);
+                }
+                return None;
             }
         }
     }
@@ -69,8 +73,8 @@ impl Writer for TcpStream {
         let res = self.rtstream.write(buf);
         match res {
             Ok(_) => (),
-            Err(_) => {
-                abort!("XXX");
+            Err(ioerr) => {
+                io_error::cond.raise(ioerr);
             }
         }
     }
@@ -106,8 +110,9 @@ impl Listener<TcpStream> for TcpListener {
             Ok(s) => {
                 Some(TcpStream::new(s))
             }
-            Err(_) => {
-                abort!("XXX");
+            Err(ioerr) => {
+                io_error::cond.raise(ioerr);
+                return None;
             }
         }
     }
@@ -174,6 +179,76 @@ mod test {
         }
     }
 
+    #[test]
+    fn read_eof() {
+        do run_in_newsched_task {
+            let addr = next_test_ip4();
+
+            do spawntask_immediately {
+                let mut listener = TcpListener::bind(addr);
+                let mut stream = listener.accept();
+                let mut buf = [0];
+                let nread = stream.read(buf);
+                assert!(nread.is_none());
+            }
+
+            do spawntask_immediately {
+                let _stream = TcpStream::connect(addr);
+                // Close
+            }
+        }
+    }
+
+    #[test]
+    fn read_eof_twice() {
+        do run_in_newsched_task {
+            let addr = next_test_ip4();
+
+            do spawntask_immediately {
+                let mut listener = TcpListener::bind(addr);
+                let mut stream = listener.accept();
+                let mut buf = [0];
+                let nread = stream.read(buf);
+                assert!(nread.is_none());
+                let nread = stream.read(buf);
+                assert!(nread.is_none());
+            }
+
+            do spawntask_immediately {
+                let _stream = TcpStream::connect(addr);
+                // Close
+            }
+        }
+    }
+
+    #[test]
+    fn write_close() {
+        do run_in_newsched_task {
+            let addr = next_test_ip4();
+
+            do spawntask_immediately {
+                let mut listener = TcpListener::bind(addr);
+                let mut stream = listener.accept();
+                let buf = [0];
+                loop {
+                    let mut stop = false;
+                    do io_error::cond.trap(|e| {
+                        assert!(e.kind == ConnectionReset);
+                        stop = true;
+                    }).in {
+                        stream.write(buf);
+                    }
+                    if stop { break }
+                }
+            }
+
+            do spawntask_immediately {
+                let stream = TcpStream::connect(addr);
+                // Close
+            }
+        }
+    }
+
     #[test]
     fn multiple_connect_serial() {
         do run_in_newsched_task {

branches/try/src/libcore/rt/uv/mod.rs

@@ -210,6 +210,10 @@ pub impl UvError {
             from_c_str(desc_str)
         }
     }
+
+    fn is_eof(&self) -> bool {
+        self.code == uvll::EOF
+    }
 }
 
 impl ToStr for UvError {
@@ -262,6 +266,7 @@ pub fn uv_error_to_io_error(uverr: UvError) -> IoError {
             EOF => EndOfFile,
             EACCES => PermissionDenied,
             ECONNREFUSED => ConnectionRefused,
+            ECONNRESET => ConnectionReset,
             e => {
                 abort!("unknown uv error code: %u", e as uint);
             }

branches/try/src/libcore/rt/uv/uvio.rs

@@ -301,7 +301,7 @@ impl RtioTcpStream for UvTcpStream {
                     assert!(nread >= 0);
                     Ok(nread as uint)
                 } else {
-                    Err(standard_error(OtherIoError))
+                    Err(uv_error_to_io_error(status.unwrap()))
                 };
 
                 unsafe { (*result_cell_ptr).put_back(result); }
@@ -330,7 +330,7 @@ impl RtioTcpStream for UvTcpStream {
                 let result = if status.is_none() {
                     Ok(())
                 } else {
-                    Err(standard_error(OtherIoError))
+                    Err(uv_error_to_io_error(status.unwrap()))
                 };
 
                 unsafe { (*result_cell_ptr).put_back(result); }

branches/try/src/libcore/rt/uv/uvll.rs

@@ -39,6 +39,7 @@ pub static EOF: c_int = 1;
 pub static EADDRINFO: c_int = 2;
 pub static EACCES: c_int = 3;
 pub static ECONNREFUSED: c_int = 12;
+pub static ECONNRESET: c_int = 13;
 
 pub struct uv_err_t {
     code: c_int,