diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2014-07-15 12:42:40 -0700 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2014-08-24 17:08:14 -0700 |
| commit | fd763a5b1e736df39d878b888b1bf14f2009672c (patch) | |
| tree | 5bcae6049440cb543eec5ae46f0d7f7d7491bc60 /src/libnative/io/pipe_unix.rs | |
| parent | c301db20a40d63ee330956a97102c3e566475f75 (diff) | |
| download | rust-fd763a5b1e736df39d878b888b1bf14f2009672c.tar.gz rust-fd763a5b1e736df39d878b888b1bf14f2009672c.zip | |
native: clone/close_accept for win32 pipes
This commits takes a similar strategy to the previous commit to implement close_accept and clone for the native win32 pipes implementation. Closes #15595
Diffstat (limited to 'src/libnative/io/pipe_unix.rs')
| -rw-r--r-- | src/libnative/io/pipe_unix.rs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/libnative/io/pipe_unix.rs b/src/libnative/io/pipe_unix.rs index 4ad8383e6f8..a3564dfe2cc 100644 --- a/src/libnative/io/pipe_unix.rs +++ b/src/libnative/io/pipe_unix.rs @@ -15,7 +15,7 @@ use std::mem; use std::rt::mutex; use std::rt::rtio; use std::rt::rtio::{IoResult, IoError}; -use std::sync::atomics; +use std::sync::atomic; use super::retry; use super::net; @@ -239,7 +239,7 @@ impl UnixListener { listener: self, reader: reader, writer: writer, - closed: atomics::AtomicBool::new(false), + closed: atomic::AtomicBool::new(false), }), deadline: 0, }) @@ -267,7 +267,7 @@ struct AcceptorInner { listener: UnixListener, reader: FileDesc, writer: FileDesc, - closed: atomics::AtomicBool, + closed: atomic::AtomicBool, } impl UnixAcceptor { @@ -276,7 +276,7 @@ impl UnixAcceptor { pub fn native_accept(&mut self) -> IoResult<UnixStream> { let deadline = if self.deadline == 0 {None} else {Some(self.deadline)}; - while !self.inner.closed.load(atomics::SeqCst) { + while !self.inner.closed.load(atomic::SeqCst) { unsafe { let mut storage: libc::sockaddr_storage = mem::zeroed(); let storagep = &mut storage as *mut libc::sockaddr_storage; @@ -317,7 +317,7 @@ impl rtio::RtioUnixAcceptor for UnixAcceptor { #[cfg(unix)] fn close_accept(&mut self) -> IoResult<()> { - self.inner.closed.store(true, atomics::SeqCst); + self.inner.closed.store(true, atomic::SeqCst); let mut fd = FileDesc::new(self.inner.writer.fd(), false); match fd.inner_write([0]) { Ok(..) => Ok(()), |
