From fd763a5b1e736df39d878b888b1bf14f2009672c Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Tue, 15 Jul 2014 12:42:40 -0700 Subject: 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 --- src/libnative/io/pipe_unix.rs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/libnative/io/pipe_unix.rs') 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 { 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(()), -- cgit 1.4.1-3-g733a5