From ec9ade938e9e4aa710f4351e48a8fda1037352aa Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Thu, 24 Apr 2014 18:48:21 -0700 Subject: std: Add close_{read,write}() methods to I/O Two new methods were added to TcpStream and UnixStream: fn close_read(&mut self) -> IoResult<()>; fn close_write(&mut self) -> IoResult<()>; These two methods map to shutdown()'s behavior (the system call on unix), closing the reading or writing half of a duplex stream. These methods are primarily added to allow waking up a pending read in another task. By closing the reading half of a connection, all pending readers will be woken up and will return with EndOfFile. The close_write() method was added for symmetry with close_read(), and I imagine that it will be quite useful at some point. Implementation-wise, librustuv got the short end of the stick this time. The native versions just delegate to the shutdown() syscall (easy). The uv versions can leverage uv_shutdown() for tcp/unix streams, but only for closing the writing half. Closing the reading half is done through some careful dancing to wake up a pending reader. As usual, windows likes to be different from unix. The windows implementation uses shutdown() for sockets, but shutdown() is not available for named pipes. Instead, CancelIoEx was used with same fancy synchronization to make sure everyone knows what's up. cc #11165 --- src/liblibc/lib.rs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src/liblibc') diff --git a/src/liblibc/lib.rs b/src/liblibc/lib.rs index a4593c1cb5a..5f67be22068 100644 --- a/src/liblibc/lib.rs +++ b/src/liblibc/lib.rs @@ -118,7 +118,7 @@ pub use consts::os::bsd44::{SOL_SOCKET, SO_KEEPALIVE, SO_ERROR}; pub use consts::os::bsd44::{SO_REUSEADDR, SO_BROADCAST, SHUT_WR, IP_MULTICAST_LOOP}; pub use consts::os::bsd44::{IP_ADD_MEMBERSHIP, IP_DROP_MEMBERSHIP}; pub use consts::os::bsd44::{IPV6_ADD_MEMBERSHIP, IPV6_DROP_MEMBERSHIP}; -pub use consts::os::bsd44::{IP_MULTICAST_TTL, IP_TTL}; +pub use consts::os::bsd44::{IP_MULTICAST_TTL, IP_TTL, SHUT_RD}; pub use funcs::c95::ctype::{isalnum, isalpha, iscntrl, isdigit}; pub use funcs::c95::ctype::{islower, isprint, ispunct, isspace}; @@ -226,6 +226,8 @@ pub use funcs::bsd43::{shutdown}; #[cfg(windows)] pub use consts::os::extra::{FILE_WRITE_ATTRIBUTES, FILE_READ_ATTRIBUTES}; #[cfg(windows)] pub use consts::os::extra::{ERROR_PIPE_BUSY, ERROR_IO_PENDING}; #[cfg(windows)] pub use consts::os::extra::{ERROR_PIPE_CONNECTED, WAIT_OBJECT_0}; +#[cfg(windows)] pub use consts::os::extra::{ERROR_NOT_FOUND}; +#[cfg(windows)] pub use consts::os::extra::{ERROR_OPERATION_ABORTED}; #[cfg(windows)] pub use types::os::common::bsd44::{SOCKET}; #[cfg(windows)] pub use types::os::common::posix01::{stat, utimbuf}; #[cfg(windows)] pub use types::os::arch::extra::{HANDLE, BOOL, LPSECURITY_ATTRIBUTES}; @@ -1740,8 +1742,10 @@ pub mod consts { pub static ERROR_NO_DATA: c_int = 232; pub static ERROR_INVALID_ADDRESS : c_int = 487; pub static ERROR_PIPE_CONNECTED: c_int = 535; + pub static ERROR_OPERATION_ABORTED: c_int = 995; pub static ERROR_IO_PENDING: c_int = 997; pub static ERROR_FILE_INVALID : c_int = 1006; + pub static ERROR_NOT_FOUND: c_int = 1168; pub static INVALID_HANDLE_VALUE : c_int = -1; pub static DELETE : DWORD = 0x00010000; -- cgit 1.4.1-3-g733a5