aquatic_common: feature-gate cpu pinning, remove hwloc feature

This commit is contained in:
Joakim Frostegård 2024-02-03 23:16:45 +01:00
parent 1acf44c001
commit 437f2def7d
11 changed files with 13 additions and 215 deletions

View file

@ -14,7 +14,7 @@ rust-version.workspace = true
name = "aquatic_ws_load_test"
[dependencies]
aquatic_common = { workspace = true, features = ["glommio"] }
aquatic_common.workspace = true
aquatic_toml_config.workspace = true
aquatic_ws_protocol.workspace = true

View file

@ -2,8 +2,6 @@ use std::sync::{atomic::Ordering, Arc};
use std::thread;
use std::time::{Duration, Instant};
use aquatic_common::cpu_pinning::glommio::{get_worker_placement, set_affinity_for_util_worker};
use aquatic_common::cpu_pinning::WorkerIndex;
use aquatic_ws_protocol::common::InfoHash;
use glommio::LocalExecutorBuilder;
use rand::prelude::*;
@ -59,19 +57,12 @@ fn run(config: Config) -> ::anyhow::Result<()> {
let tls_config = create_tls_config().unwrap();
for i in 0..config.num_workers {
for _ in 0..config.num_workers {
let config = config.clone();
let tls_config = tls_config.clone();
let state = state.clone();
let placement = get_worker_placement(
&config.cpu_pinning,
config.num_workers,
0,
WorkerIndex::SocketWorker(i),
)?;
LocalExecutorBuilder::new(placement)
LocalExecutorBuilder::default()
.name("load-test")
.spawn(move || async move {
run_socket_thread(config, tls_config, state).await.unwrap();
@ -79,10 +70,6 @@ fn run(config: Config) -> ::anyhow::Result<()> {
.unwrap();
}
if config.cpu_pinning.active {
set_affinity_for_util_worker(&config.cpu_pinning, config.num_workers, 0)?;
}
monitor_statistics(state, &config);
Ok(())