Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(net): ensure the reactor and runtime are running #819

Merged
merged 3 commits into from
Jun 18, 2020
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/net/tcp/listener.rs
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,8 @@ impl TcpListener {
///
/// [`local_addr`]: #method.local_addr
pub async fn bind<A: ToSocketAddrs>(addrs: A) -> io::Result<TcpListener> {
once_cell::sync::Lazy::force(&crate::rt::RUNTIME);

let mut last_err = None;
let addrs = addrs.to_socket_addrs().await?;

Expand Down Expand Up @@ -200,6 +202,8 @@ impl<'a> Stream for Incoming<'a> {
impl From<std::net::TcpListener> for TcpListener {
/// Converts a `std::net::TcpListener` into its asynchronous equivalent.
fn from(listener: std::net::TcpListener) -> TcpListener {
once_cell::sync::Lazy::force(&crate::rt::RUNTIME);

TcpListener {
watcher: Async::new(listener).expect("TcpListener is known to be good"),
}
Expand Down
4 changes: 4 additions & 0 deletions src/net/tcp/stream.rs
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,8 @@ impl TcpStream {
/// # Ok(()) }) }
/// ```
pub async fn connect<A: ToSocketAddrs>(addrs: A) -> io::Result<TcpStream> {
once_cell::sync::Lazy::force(&crate::rt::RUNTIME);

let mut last_err = None;
let addrs = addrs.to_socket_addrs().await?;

Expand Down Expand Up @@ -356,6 +358,8 @@ impl Write for &TcpStream {
impl From<std::net::TcpStream> for TcpStream {
/// Converts a `std::net::TcpStream` into its asynchronous equivalent.
fn from(stream: std::net::TcpStream) -> TcpStream {
once_cell::sync::Lazy::force(&crate::rt::RUNTIME);

TcpStream {
watcher: Arc::new(Async::new(stream).expect("TcpStream is known to be good")),
}
Expand Down
4 changes: 4 additions & 0 deletions src/net/udp/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,8 @@ impl UdpSocket {
/// # Ok(()) }) }
/// ```
pub async fn bind<A: ToSocketAddrs>(addrs: A) -> io::Result<UdpSocket> {
once_cell::sync::Lazy::force(&crate::rt::RUNTIME);

let mut last_err = None;
let addrs = addrs.to_socket_addrs().await?;

Expand Down Expand Up @@ -479,6 +481,8 @@ impl UdpSocket {
impl From<std::net::UdpSocket> for UdpSocket {
/// Converts a `std::net::UdpSocket` into its asynchronous equivalent.
fn from(socket: std::net::UdpSocket) -> UdpSocket {
once_cell::sync::Lazy::force(&crate::rt::RUNTIME);

UdpSocket {
watcher: Async::new(socket).expect("UdpSocket is known to be good"),
}
Expand Down
8 changes: 8 additions & 0 deletions src/os/unix/net/datagram.rs
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@ pub struct UnixDatagram {

impl UnixDatagram {
fn new(socket: StdUnixDatagram) -> UnixDatagram {
once_cell::sync::Lazy::force(&crate::rt::RUNTIME);

UnixDatagram {
watcher: Async::new(socket).expect("UnixDatagram is known to be good"),
}
Expand All @@ -64,6 +66,8 @@ impl UnixDatagram {
/// # Ok(()) }) }
/// ```
pub async fn bind<P: AsRef<Path>>(path: P) -> io::Result<UnixDatagram> {
once_cell::sync::Lazy::force(&crate::rt::RUNTIME);

let path = path.as_ref().to_owned();
let socket = Async::<StdUnixDatagram>::bind(path)?;
Ok(UnixDatagram { watcher: socket })
Expand Down Expand Up @@ -305,6 +309,8 @@ impl fmt::Debug for UnixDatagram {
impl From<StdUnixDatagram> for UnixDatagram {
/// Converts a `std::os::unix::net::UnixDatagram` into its asynchronous equivalent.
fn from(datagram: StdUnixDatagram) -> UnixDatagram {
once_cell::sync::Lazy::force(&crate::rt::RUNTIME);

UnixDatagram {
watcher: Async::new(datagram).expect("UnixDatagram is known to be good"),
}
Expand All @@ -319,6 +325,8 @@ impl AsRawFd for UnixDatagram {

impl FromRawFd for UnixDatagram {
unsafe fn from_raw_fd(fd: RawFd) -> UnixDatagram {
once_cell::sync::Lazy::force(&crate::rt::RUNTIME);

let raw = StdUnixDatagram::from_raw_fd(fd);
let datagram = Async::<StdUnixDatagram>::new(raw).expect("invalid file descriptor");
UnixDatagram { watcher: datagram }
Expand Down
11 changes: 10 additions & 1 deletion src/os/unix/net/listener.rs
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,8 @@ impl UnixListener {
/// # Ok(()) }) }
/// ```
pub async fn bind<P: AsRef<Path>>(path: P) -> io::Result<UnixListener> {
once_cell::sync::Lazy::force(&crate::rt::RUNTIME);

let path = path.as_ref().to_owned();
let listener = Async::<StdUnixListener>::bind(path)?;

Expand All @@ -93,7 +95,12 @@ impl UnixListener {
pub async fn accept(&self) -> io::Result<(UnixStream, SocketAddr)> {
let (stream, addr) = self.watcher.accept().await?;

Ok((UnixStream { watcher: Arc::new(stream) }, addr))
Ok((
UnixStream {
watcher: Arc::new(stream),
},
addr,
))
}

/// Returns a stream of incoming connections.
Expand Down Expand Up @@ -187,6 +194,8 @@ impl Stream for Incoming<'_> {
impl From<StdUnixListener> for UnixListener {
/// Converts a `std::os::unix::net::UnixListener` into its asynchronous equivalent.
fn from(listener: StdUnixListener) -> UnixListener {
once_cell::sync::Lazy::force(&crate::rt::RUNTIME);

UnixListener {
watcher: Async::new(listener).expect("UnixListener is known to be good"),
}
Expand Down
10 changes: 9 additions & 1 deletion src/os/unix/net/stream.rs
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,8 @@ impl UnixStream {
/// # Ok(()) }) }
/// ```
pub async fn connect<P: AsRef<Path>>(path: P) -> io::Result<UnixStream> {
once_cell::sync::Lazy::force(&crate::rt::RUNTIME);

let path = path.as_ref().to_owned();
let stream = Arc::new(Async::<StdUnixStream>::connect(path).await?);

Expand All @@ -79,6 +81,8 @@ impl UnixStream {
/// # Ok(()) }) }
/// ```
pub fn pair() -> io::Result<(UnixStream, UnixStream)> {
once_cell::sync::Lazy::force(&crate::rt::RUNTIME);

let (a, b) = Async::<StdUnixStream>::pair()?;
let a = UnixStream {
watcher: Arc::new(a),
Expand Down Expand Up @@ -224,8 +228,12 @@ impl fmt::Debug for UnixStream {
impl From<StdUnixStream> for UnixStream {
/// Converts a `std::os::unix::net::UnixStream` into its asynchronous equivalent.
fn from(stream: StdUnixStream) -> UnixStream {
once_cell::sync::Lazy::force(&crate::rt::RUNTIME);

let stream = Async::new(stream).expect("UnixStream is known to be good");
UnixStream { watcher: Arc::new(stream) }
UnixStream {
watcher: Arc::new(stream),
}
}
}

Expand Down