This removes a large array of deprecated functionality, regardless of how recently it was deprecated. The purpose of this commit is to clean out the standard libraries and compiler for the upcoming alpha release. Some notable compiler changes were to enable warnings for all now-deprecated command line arguments (previously the deprecated versions were silently accepted) as well as removing deriving(Zero) entirely (the trait was removed). The distribution no longer contains the libtime or libregex_macros crates. Both of these have been deprecated for some time and are available externally.
235 lines
7.7 KiB
Rust
235 lines
7.7 KiB
Rust
// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
|
|
// file at the top-level directory of this distribution and at
|
|
// http://rust-lang.org/COPYRIGHT.
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
|
|
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
|
|
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
|
|
// option. This file may not be copied, modified, or distributed
|
|
// except according to those terms.
|
|
|
|
use io::net::ip;
|
|
use io::IoResult;
|
|
use libc;
|
|
use mem;
|
|
use ptr;
|
|
use prelude::v1::*;
|
|
use super::{last_error, last_net_error, retry, sock_t};
|
|
use sync::Arc;
|
|
use sync::atomic::{AtomicBool, Ordering};
|
|
use sys::fs::FileDesc;
|
|
use sys::{self, c, set_nonblocking, wouldblock, timer};
|
|
use sys_common::{self, timeout, eof, net};
|
|
|
|
pub use sys_common::net::TcpStream;
|
|
|
|
pub struct Event(c::WSAEVENT);
|
|
|
|
unsafe impl Send for Event {}
|
|
unsafe impl Sync for Event {}
|
|
|
|
impl Event {
|
|
pub fn new() -> IoResult<Event> {
|
|
let event = unsafe { c::WSACreateEvent() };
|
|
if event == c::WSA_INVALID_EVENT {
|
|
Err(super::last_error())
|
|
} else {
|
|
Ok(Event(event))
|
|
}
|
|
}
|
|
|
|
pub fn handle(&self) -> c::WSAEVENT { let Event(handle) = *self; handle }
|
|
}
|
|
|
|
impl Drop for Event {
|
|
fn drop(&mut self) {
|
|
unsafe { let _ = c::WSACloseEvent(self.handle()); }
|
|
}
|
|
}
|
|
|
|
////////////////////////////////////////////////////////////////////////////////
|
|
// TCP listeners
|
|
////////////////////////////////////////////////////////////////////////////////
|
|
|
|
pub struct TcpListener { sock: sock_t }
|
|
|
|
unsafe impl Send for TcpListener {}
|
|
unsafe impl Sync for TcpListener {}
|
|
|
|
impl TcpListener {
|
|
pub fn bind(addr: ip::SocketAddr) -> IoResult<TcpListener> {
|
|
sys::init_net();
|
|
|
|
let sock = try!(net::socket(addr, libc::SOCK_STREAM));
|
|
let ret = TcpListener { sock: sock };
|
|
|
|
let mut storage = unsafe { mem::zeroed() };
|
|
let len = net::addr_to_sockaddr(addr, &mut storage);
|
|
let addrp = &storage as *const _ as *const libc::sockaddr;
|
|
|
|
match unsafe { libc::bind(sock, addrp, len) } {
|
|
-1 => Err(last_net_error()),
|
|
_ => Ok(ret),
|
|
}
|
|
}
|
|
|
|
pub fn socket(&self) -> sock_t { self.sock }
|
|
|
|
pub fn listen(self, backlog: int) -> IoResult<TcpAcceptor> {
|
|
match unsafe { libc::listen(self.socket(), backlog as libc::c_int) } {
|
|
-1 => Err(last_net_error()),
|
|
|
|
_ => {
|
|
let accept = try!(Event::new());
|
|
let ret = unsafe {
|
|
c::WSAEventSelect(self.socket(), accept.handle(), c::FD_ACCEPT)
|
|
};
|
|
if ret != 0 {
|
|
return Err(last_net_error())
|
|
}
|
|
Ok(TcpAcceptor {
|
|
inner: Arc::new(AcceptorInner {
|
|
listener: self,
|
|
abort: try!(Event::new()),
|
|
accept: accept,
|
|
closed: AtomicBool::new(false),
|
|
}),
|
|
deadline: 0,
|
|
})
|
|
}
|
|
}
|
|
}
|
|
|
|
pub fn socket_name(&mut self) -> IoResult<ip::SocketAddr> {
|
|
net::sockname(self.socket(), libc::getsockname)
|
|
}
|
|
}
|
|
|
|
impl Drop for TcpListener {
|
|
fn drop(&mut self) {
|
|
unsafe { super::close_sock(self.sock); }
|
|
}
|
|
}
|
|
|
|
pub struct TcpAcceptor {
|
|
inner: Arc<AcceptorInner>,
|
|
deadline: u64,
|
|
}
|
|
|
|
unsafe impl Send for TcpAcceptor {}
|
|
unsafe impl Sync for TcpAcceptor {}
|
|
|
|
struct AcceptorInner {
|
|
listener: TcpListener,
|
|
abort: Event,
|
|
accept: Event,
|
|
closed: AtomicBool,
|
|
}
|
|
|
|
unsafe impl Send for AcceptorInner {}
|
|
unsafe impl Sync for AcceptorInner {}
|
|
|
|
impl TcpAcceptor {
|
|
pub fn socket(&self) -> sock_t { self.inner.listener.socket() }
|
|
|
|
pub fn accept(&mut self) -> IoResult<TcpStream> {
|
|
// Unlink unix, windows cannot invoke `select` on arbitrary file
|
|
// descriptors like pipes, only sockets. Consequently, windows cannot
|
|
// use the same implementation as unix for accept() when close_accept()
|
|
// is considered.
|
|
//
|
|
// In order to implement close_accept() and timeouts, windows uses
|
|
// event handles. An acceptor-specific abort event is created which
|
|
// will only get set in close_accept(), and it will never be un-set.
|
|
// Additionally, another acceptor-specific event is associated with the
|
|
// FD_ACCEPT network event.
|
|
//
|
|
// These two events are then passed to WaitForMultipleEvents to see
|
|
// which one triggers first, and the timeout passed to this function is
|
|
// the local timeout for the acceptor.
|
|
//
|
|
// If the wait times out, then the accept timed out. If the wait
|
|
// succeeds with the abort event, then we were closed, and if the wait
|
|
// succeeds otherwise, then we do a nonblocking poll via `accept` to
|
|
// see if we can accept a connection. The connection is candidate to be
|
|
// stolen, so we do all of this in a loop as well.
|
|
let events = [self.inner.abort.handle(), self.inner.accept.handle()];
|
|
|
|
while !self.inner.closed.load(Ordering::SeqCst) {
|
|
let ms = if self.deadline == 0 {
|
|
c::WSA_INFINITE as u64
|
|
} else {
|
|
let now = timer::now();
|
|
if self.deadline < now {0} else {self.deadline - now}
|
|
};
|
|
let ret = unsafe {
|
|
c::WSAWaitForMultipleEvents(2, events.as_ptr(), libc::FALSE,
|
|
ms as libc::DWORD, libc::FALSE)
|
|
};
|
|
match ret {
|
|
c::WSA_WAIT_TIMEOUT => {
|
|
return Err(timeout("accept timed out"))
|
|
}
|
|
c::WSA_WAIT_FAILED => return Err(last_net_error()),
|
|
c::WSA_WAIT_EVENT_0 => break,
|
|
n => assert_eq!(n, c::WSA_WAIT_EVENT_0 + 1),
|
|
}
|
|
|
|
let mut wsaevents: c::WSANETWORKEVENTS = unsafe { mem::zeroed() };
|
|
let ret = unsafe {
|
|
c::WSAEnumNetworkEvents(self.socket(), events[1], &mut wsaevents)
|
|
};
|
|
if ret != 0 { return Err(last_net_error()) }
|
|
|
|
if wsaevents.lNetworkEvents & c::FD_ACCEPT == 0 { continue }
|
|
match unsafe {
|
|
libc::accept(self.socket(), ptr::null_mut(), ptr::null_mut())
|
|
} {
|
|
-1 if wouldblock() => {}
|
|
-1 => return Err(last_net_error()),
|
|
|
|
// Accepted sockets inherit the same properties as the caller,
|
|
// so we need to deregister our event and switch the socket back
|
|
// to blocking mode
|
|
socket => {
|
|
let stream = TcpStream::new(socket);
|
|
let ret = unsafe {
|
|
c::WSAEventSelect(socket, events[1], 0)
|
|
};
|
|
if ret != 0 { return Err(last_net_error()) }
|
|
try!(set_nonblocking(socket, false));
|
|
return Ok(stream)
|
|
}
|
|
}
|
|
}
|
|
|
|
Err(eof())
|
|
}
|
|
|
|
pub fn socket_name(&mut self) -> IoResult<ip::SocketAddr> {
|
|
net::sockname(self.socket(), libc::getsockname)
|
|
}
|
|
|
|
pub fn set_timeout(&mut self, timeout: Option<u64>) {
|
|
self.deadline = timeout.map(|a| timer::now() + a).unwrap_or(0);
|
|
}
|
|
|
|
pub fn close_accept(&mut self) -> IoResult<()> {
|
|
self.inner.closed.store(true, Ordering::SeqCst);
|
|
let ret = unsafe { c::WSASetEvent(self.inner.abort.handle()) };
|
|
if ret == libc::TRUE {
|
|
Ok(())
|
|
} else {
|
|
Err(last_net_error())
|
|
}
|
|
}
|
|
}
|
|
|
|
impl Clone for TcpAcceptor {
|
|
fn clone(&self) -> TcpAcceptor {
|
|
TcpAcceptor {
|
|
inner: self.inner.clone(),
|
|
deadline: 0,
|
|
}
|
|
}
|
|
}
|