YGGverse/aquatic
1
0
Fork 0
mirror of https://github.com/YGGverse/aquatic.git synced 2026-04-02 10:45:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

cpu pinning: set affinity to multiple hyperthreads, fix issues

Browse source
This commit is contained in:
Joakim Frostegård 2021-11-07 13:31:03 +01:00
parent 03192d2afb
commit e86410291a
11 changed files with 181 additions and 165 deletions
Download patch file Download diff file Expand all files Collapse all files

38
aquatic_ws/src/lib/glommio/mod.rs
View file

@ -21,12 +21,6 @@ use glommio::{channels::channel_mesh::MeshBuilder, prelude::*};
const SHARED_CHANNEL_SIZE: usize = 1024;
pub fn run_inner(config: Config, state: State) -> anyhow::Result<()> {
pin_current_if_configured_to(
&config.cpu_pinning,
config.socket_workers,
WorkerIndex::Other,
);
let num_peers = config.socket_workers + config.request_workers;
let request_mesh_builder = MeshBuilder::partial(num_peers, SHARED_CHANNEL_SIZE);
@ -46,16 +40,13 @@ pub fn run_inner(config: Config, state: State) -> anyhow::Result<()> {
let response_mesh_builder = response_mesh_builder.clone();
let num_bound_sockets = num_bound_sockets.clone();
let mut builder = LocalExecutorBuilder::default();
if config.cpu_pinning.active {
builder = builder.pin_to_cpu(
WorkerIndex::SocketWorker(i)
.get_cpu_index(&config.cpu_pinning, config.socket_workers),
let executor = LocalExecutorBuilder::default().spawn(move || async move {
pin_current_if_configured_to(
&config.cpu_pinning,
config.socket_workers,
WorkerIndex::SocketWorker(i),
);
}
let executor = builder.spawn(|| async move {
network::run_socket_worker(
config,
state,
@ -76,16 +67,13 @@ pub fn run_inner(config: Config, state: State) -> anyhow::Result<()> {
let request_mesh_builder = request_mesh_builder.clone();
let response_mesh_builder = response_mesh_builder.clone();
let mut builder = LocalExecutorBuilder::default();
if config.cpu_pinning.active {
builder = builder.pin_to_cpu(
WorkerIndex::RequestWorker(i)
.get_cpu_index(&config.cpu_pinning, config.socket_workers),
let executor = LocalExecutorBuilder::default().spawn(move || async move {
pin_current_if_configured_to(
&config.cpu_pinning,
config.socket_workers,
WorkerIndex::RequestWorker(i),
);
}
let executor = builder.spawn(|| async move {
handlers::run_request_worker(config, state, request_mesh_builder, response_mesh_builder)
.await
});
@ -100,6 +88,12 @@ pub fn run_inner(config: Config, state: State) -> anyhow::Result<()> {
)
.unwrap();
pin_current_if_configured_to(
&config.cpu_pinning,
config.socket_workers,
WorkerIndex::Other,
);
for executor in executors {
executor
.expect("failed to spawn local executor")

12
aquatic_ws/src/lib/lib.rs
View file

@ -17,12 +17,6 @@ pub mod mio;
pub const APP_NAME: &str = "aquatic_ws: WebTorrent tracker";
pub fn run(config: Config) -> ::anyhow::Result<()> {
pin_current_if_configured_to(
&config.cpu_pinning,
config.socket_workers,
WorkerIndex::Other,
);
cfg_if!(
if #[cfg(feature = "with-glommio")] {
let state = glommio::common::State::default();
@ -48,6 +42,12 @@ pub fn run(config: Config) -> ::anyhow::Result<()> {
);
}
pin_current_if_configured_to(
&config.cpu_pinning,
config.socket_workers,
WorkerIndex::Other,
);
for signal in &mut signals {
match signal {
SIGUSR1 => {

8
aquatic_ws/src/lib/mio/mod.rs
View file

@ -22,16 +22,16 @@ use common::*;
pub const APP_NAME: &str = "aquatic_ws: WebTorrent tracker";
pub fn run(config: Config, state: State) -> anyhow::Result<()> {
start_workers(config.clone(), state.clone()).expect("couldn't start workers");
// TODO: privdrop here instead
pin_current_if_configured_to(
&config.cpu_pinning,
config.socket_workers,
WorkerIndex::Other,
);
start_workers(config.clone(), state.clone()).expect("couldn't start workers");
// TODO: privdrop here instead
loop {
::std::thread::sleep(Duration::from_secs(
config.cleaning.torrent_cleaning_interval,