YGGverse/aquatic
1
0
Fork 0
mirror of https://github.com/YGGverse/aquatic.git synced 2026-03-31 17:55:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

aquatic_common, udp, udp load test: improve cpu pinning

Browse source
This commit is contained in:
Joakim Frostegård 2021-11-07 11:03:49 +01:00
parent 91a62ab73a
commit aa332ab296
9 changed files with 142 additions and 78 deletions
Download patch file Download diff file Expand all files Collapse all files

31
aquatic_udp/src/lib/glommio/mod.rs
View file

@ -1,6 +1,7 @@
use std::sync::{atomic::AtomicUsize, Arc};
use aquatic_common::access_list::update_access_list;
use aquatic_common::cpu_pinning::{pin_current_if_configured_to, WorkerIndex};
use aquatic_common::privileges::drop_privileges_after_socket_binding;
use glommio::channels::channel_mesh::MeshBuilder;
use glommio::prelude::*;
@ -18,11 +19,11 @@ pub mod network;
pub const SHARED_CHANNEL_SIZE: usize = 4096;
pub fn run(config: Config) -> ::anyhow::Result<()> {
if config.cpu_pinning.active {
core_affinity::set_for_current(core_affinity::CoreId {
id: config.cpu_pinning.offset,
});
}
pin_current_if_configured_to(
&config.cpu_pinning,
config.socket_workers,
WorkerIndex::Other,
);
let state = State::default();
@ -50,11 +51,11 @@ pub fn run(config: Config) -> ::anyhow::Result<()> {
}
pub fn run_inner(config: Config, state: State) -> anyhow::Result<()> {
if config.cpu_pinning.active {
core_affinity::set_for_current(core_affinity::CoreId {
id: config.cpu_pinning.offset,
});
}
pin_current_if_configured_to(
&config.cpu_pinning,
config.socket_workers,
WorkerIndex::Other,
);
let num_peers = config.socket_workers + config.request_workers;
@ -75,7 +76,10 @@ pub fn run_inner(config: Config, state: State) -> anyhow::Result<()> {
let mut builder = LocalExecutorBuilder::default();
if config.cpu_pinning.active {
builder = builder.pin_to_cpu(config.cpu_pinning.offset + 1 + i);
builder = builder.pin_to_cpu(
WorkerIndex::SocketWorker(i)
.get_cpu_index(&config.cpu_pinning, config.socket_workers),
);
}
let executor = builder.spawn(|| async move {
@ -101,7 +105,10 @@ pub fn run_inner(config: Config, state: State) -> anyhow::Result<()> {
let mut builder = LocalExecutorBuilder::default();
if config.cpu_pinning.active {
builder = builder.pin_to_cpu(config.cpu_pinning.offset + 1 + config.socket_workers + i);
builder = builder.pin_to_cpu(
WorkerIndex::RequestWorker(i)
.get_cpu_index(&config.cpu_pinning, config.socket_workers),
);
}
let executor = builder.spawn(|| async move {

51
aquatic_udp/src/lib/mio/mod.rs
View file

@ -3,6 +3,7 @@ use std::thread::Builder;
use std::time::Duration;
use anyhow::Context;
use aquatic_common::cpu_pinning::{pin_current_if_configured_to, WorkerIndex};
use aquatic_common::privileges::drop_privileges_after_socket_binding;
use crossbeam_channel::unbounded;
@ -20,11 +21,11 @@ pub mod tasks;
use common::State;
pub fn run(config: Config) -> ::anyhow::Result<()> {
if config.cpu_pinning.active {
core_affinity::set_for_current(core_affinity::CoreId {
id: config.cpu_pinning.offset,
});
}
pin_current_if_configured_to(
&config.cpu_pinning,
config.socket_workers,
WorkerIndex::Other,
);
let state = State::default();
@ -52,11 +53,11 @@ pub fn run(config: Config) -> ::anyhow::Result<()> {
}
pub fn run_inner(config: Config, state: State) -> ::anyhow::Result<()> {
if config.cpu_pinning.active {
core_affinity::set_for_current(core_affinity::CoreId {
id: config.cpu_pinning.offset,
});
}
pin_current_if_configured_to(
&config.cpu_pinning,
config.socket_workers,
WorkerIndex::Other,
);
let num_bound_sockets = Arc::new(AtomicUsize::new(0));
@ -72,11 +73,11 @@ pub fn run_inner(config: Config, state: State) -> ::anyhow::Result<()> {
Builder::new()
.name(format!("request-{:02}", i + 1))
.spawn(move || {
if config.cpu_pinning.active {
core_affinity::set_for_current(core_affinity::CoreId {
id: config.cpu_pinning.offset + 1 + i,
});
}
pin_current_if_configured_to(
&config.cpu_pinning,
config.socket_workers,
WorkerIndex::RequestWorker(i),
);
handlers::run_request_worker(state, config, request_receiver, response_sender)
})
@ -93,11 +94,11 @@ pub fn run_inner(config: Config, state: State) -> ::anyhow::Result<()> {
Builder::new()
.name(format!("socket-{:02}", i + 1))
.spawn(move || {
if config.cpu_pinning.active {
core_affinity::set_for_current(core_affinity::CoreId {
id: config.cpu_pinning.offset + 1 + config.request_workers + i,
});
}
pin_current_if_configured_to(
&config.cpu_pinning,
config.socket_workers,
WorkerIndex::SocketWorker(i),
);
network::run_socket_worker(
state,
@ -118,11 +119,11 @@ pub fn run_inner(config: Config, state: State) -> ::anyhow::Result<()> {
Builder::new()
.name("statistics-collector".to_string())
.spawn(move || {
if config.cpu_pinning.active {
core_affinity::set_for_current(core_affinity::CoreId {
id: config.cpu_pinning.offset,
});
}
pin_current_if_configured_to(
&config.cpu_pinning,
config.socket_workers,
WorkerIndex::Other,
);
loop {
::std::thread::sleep(Duration::from_secs(config.statistics.interval));