Skip to content

Make windows http server multithreaded #670

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Apr 12, 2022
Merged

Make windows http server multithreaded #670

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
31 changes: 4 additions & 27 deletions http/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,16 +343,6 @@ where
self
}

/// Sets number of threads of the server to run.
///
/// Panics when set to `0`.
#[cfg(not(unix))]
#[allow(unused_mut)]
pub fn threads(mut self, _threads: usize) -> Self {
warn!("Multi-threaded server is not available on Windows. Falling back to single thread.");
self
}

/// Sets number of threads of the server to run.
///
/// Panics when set to `0`.
Expand All @@ -362,7 +352,6 @@ where
/// So it's also possible to run a multi-threaded server by
/// passing the default `tokio::runtime` executor to this builder
/// and setting `threads` to 1.
#[cfg(unix)]
pub fn threads(mut self, threads: usize) -> Self {
self.threads = threads;
self
Expand Down Expand Up @@ -558,25 +547,20 @@ fn serve<M: jsonrpc::Metadata, S: jsonrpc::Middleware<M>>(
// non-blocking mode of operation (future Tokio/Hyper versions
// require for the callers to do that manually)
listener.set_nonblocking(true)?;
// HACK: See below.
#[cfg(windows)]
let raw_socket = std::os::windows::io::AsRawSocket::as_raw_socket(&listener);
#[cfg(not(windows))]
let raw_socket = ();

let server_builder =
hyper::Server::from_tcp(listener).map_err(|e| io::Error::new(io::ErrorKind::Other, e))?;
// Add current host to allowed headers.
// NOTE: we need to use `l.local_addr()` instead of `addr`
// it might be different!
Ok((server_builder, local_addr, raw_socket))
Ok((server_builder, local_addr))
};

let bind_result = match bind() {
Ok((server_builder, local_addr, raw_socket)) => {
Ok((server_builder, local_addr)) => {
// Send local address
match local_addr_tx.send(Ok(local_addr)) {
Ok(_) => Ok((server_builder, local_addr, raw_socket)),
Ok(_) => Ok((server_builder, local_addr)),
Err(_) => {
warn!(
"Thread {:?} unable to reach receiver, closing server",
Expand All @@ -594,7 +578,7 @@ fn serve<M: jsonrpc::Metadata, S: jsonrpc::Middleware<M>>(
}
};

let (server_builder, local_addr, _raw_socket) = bind_result?;
let (server_builder, local_addr) = bind_result?;

let allowed_hosts = server_utils::hosts::update(allowed_hosts, &local_addr);

Expand Down Expand Up @@ -631,13 +615,6 @@ fn serve<M: jsonrpc::Metadata, S: jsonrpc::Middleware<M>>(
error!("Error running HTTP server: {:?}", err);
}

// FIXME: Work around TCP listener socket not being properly closed
// in mio v0.6. This runs the std::net::TcpListener's destructor,
// which closes the underlying OS socket.
// Remove this once we migrate to Tokio 1.0.
#[cfg(windows)]
let _: std::net::TcpListener = unsafe { std::os::windows::io::FromRawSocket::from_raw_socket(_raw_socket) };

done_tx.send(())
});
}
Expand Down