From 35b8a1820d4332f22c8eebae3d6ff41ebcaf51bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joakim=20Frosteg=C3=A5rd?= Date: Wed, 27 Oct 2021 20:21:11 +0200 Subject: [PATCH] Rename CoreAffinityConfig to CpuPinningConfig, rename fields --- aquatic_common/src/cpu_pinning.rs | 8 ++++---- aquatic_http/src/lib/config.rs | 6 +++--- aquatic_http/src/lib/glommio/mod.rs | 12 ++++++------ aquatic_udp/src/lib/config.rs | 6 +++--- aquatic_udp/src/lib/glommio/mod.rs | 12 ++++++------ aquatic_udp/src/lib/mio/mod.rs | 16 ++++++++-------- 6 files changed, 30 insertions(+), 30 deletions(-) diff --git a/aquatic_common/src/cpu_pinning.rs b/aquatic_common/src/cpu_pinning.rs index e76f652..386e52b 100644 --- a/aquatic_common/src/cpu_pinning.rs +++ b/aquatic_common/src/cpu_pinning.rs @@ -2,15 +2,15 @@ use serde::{Serialize, Deserialize}; #[derive(Clone, Debug, Serialize, Deserialize)] #[serde(default)] -pub struct CoreAffinityConfig { - pub set_affinities: bool, +pub struct CpuPinningConfig { + pub active: bool, pub offset: usize, } -impl Default for CoreAffinityConfig { +impl Default for CpuPinningConfig { fn default() -> Self { Self { - set_affinities: false, + active: false, offset: 0, } } diff --git a/aquatic_http/src/lib/config.rs b/aquatic_http/src/lib/config.rs index e725dbf..0be33ed 100644 --- a/aquatic_http/src/lib/config.rs +++ b/aquatic_http/src/lib/config.rs @@ -1,7 +1,7 @@ use std::{net::SocketAddr, path::PathBuf}; use aquatic_common::access_list::AccessListConfig; -use aquatic_common::cpu_pinning::CoreAffinityConfig; +use aquatic_common::cpu_pinning::CpuPinningConfig; use serde::{Deserialize, Serialize}; use aquatic_cli_helpers::LogLevel; @@ -24,7 +24,7 @@ pub struct Config { pub statistics: StatisticsConfig, pub privileges: PrivilegeConfig, pub access_list: AccessListConfig, - pub core_affinity: CoreAffinityConfig, + pub cpu_pinning: CpuPinningConfig, } impl aquatic_cli_helpers::Config for Config { @@ -118,7 +118,7 @@ impl Default for Config { statistics: StatisticsConfig::default(), privileges: PrivilegeConfig::default(), access_list: AccessListConfig::default(), - core_affinity: CoreAffinityConfig::default(), + cpu_pinning: CpuPinningConfig::default(), } } } diff --git a/aquatic_http/src/lib/glommio/mod.rs b/aquatic_http/src/lib/glommio/mod.rs index f53ed78..5976602 100644 --- a/aquatic_http/src/lib/glommio/mod.rs +++ b/aquatic_http/src/lib/glommio/mod.rs @@ -16,9 +16,9 @@ mod network; const SHARED_CHANNEL_SIZE: usize = 1024; pub fn run(config: Config) -> anyhow::Result<()> { - if config.core_affinity.set_affinities { + if config.cpu_pinning.active { core_affinity::set_for_current(core_affinity::CoreId { - id: config.core_affinity.offset, + id: config.cpu_pinning.offset, }); } @@ -49,8 +49,8 @@ pub fn run(config: Config) -> anyhow::Result<()> { let mut builder = LocalExecutorBuilder::default(); - if config.core_affinity.set_affinities { - builder = builder.pin_to_cpu(config.core_affinity.offset + 1 + i); + if config.cpu_pinning.active { + builder = builder.pin_to_cpu(config.cpu_pinning.offset + 1 + i); } let executor = builder.spawn(|| async move { @@ -76,9 +76,9 @@ pub fn run(config: Config) -> anyhow::Result<()> { let mut builder = LocalExecutorBuilder::default(); - if config.core_affinity.set_affinities { + if config.cpu_pinning.active { builder = - builder.pin_to_cpu(config.core_affinity.offset + 1 + config.socket_workers + i); + builder.pin_to_cpu(config.cpu_pinning.offset + 1 + config.socket_workers + i); } let executor = builder.spawn(|| async move { diff --git a/aquatic_udp/src/lib/config.rs b/aquatic_udp/src/lib/config.rs index f897a96..ccf1b37 100644 --- a/aquatic_udp/src/lib/config.rs +++ b/aquatic_udp/src/lib/config.rs @@ -1,7 +1,7 @@ use std::net::SocketAddr; use aquatic_common::access_list::AccessListConfig; -use aquatic_common::cpu_pinning::CoreAffinityConfig; +use aquatic_common::cpu_pinning::CpuPinningConfig; use serde::{Deserialize, Serialize}; use aquatic_cli_helpers::LogLevel; @@ -26,7 +26,7 @@ pub struct Config { pub cleaning: CleaningConfig, pub privileges: PrivilegeConfig, pub access_list: AccessListConfig, - pub core_affinity: CoreAffinityConfig, + pub cpu_pinning: CpuPinningConfig, } impl aquatic_cli_helpers::Config for Config { @@ -125,7 +125,7 @@ impl Default for Config { cleaning: CleaningConfig::default(), privileges: PrivilegeConfig::default(), access_list: AccessListConfig::default(), - core_affinity: CoreAffinityConfig::default(), + cpu_pinning: CpuPinningConfig::default(), } } } diff --git a/aquatic_udp/src/lib/glommio/mod.rs b/aquatic_udp/src/lib/glommio/mod.rs index d95121f..407bb18 100644 --- a/aquatic_udp/src/lib/glommio/mod.rs +++ b/aquatic_udp/src/lib/glommio/mod.rs @@ -14,9 +14,9 @@ pub mod network; pub const SHARED_CHANNEL_SIZE: usize = 4096; pub fn run(config: Config) -> anyhow::Result<()> { - if config.core_affinity.set_affinities { + if config.cpu_pinning.active { core_affinity::set_for_current(core_affinity::CoreId { - id: config.core_affinity.offset, + id: config.cpu_pinning.offset, }); } @@ -44,8 +44,8 @@ pub fn run(config: Config) -> anyhow::Result<()> { let mut builder = LocalExecutorBuilder::default(); - if config.core_affinity.set_affinities { - builder = builder.pin_to_cpu(config.core_affinity.offset + 1 + i); + if config.cpu_pinning.active { + builder = builder.pin_to_cpu(config.cpu_pinning.offset + 1 + i); } let executor = builder.spawn(|| async move { @@ -70,9 +70,9 @@ pub fn run(config: Config) -> anyhow::Result<()> { let mut builder = LocalExecutorBuilder::default(); - if config.core_affinity.set_affinities { + if config.cpu_pinning.active { builder = - builder.pin_to_cpu(config.core_affinity.offset + 1 + config.socket_workers + i); + builder.pin_to_cpu(config.cpu_pinning.offset + 1 + config.socket_workers + i); } let executor = builder.spawn(|| async move { diff --git a/aquatic_udp/src/lib/mio/mod.rs b/aquatic_udp/src/lib/mio/mod.rs index 5c5f649..0a74702 100644 --- a/aquatic_udp/src/lib/mio/mod.rs +++ b/aquatic_udp/src/lib/mio/mod.rs @@ -21,9 +21,9 @@ use crate::drop_privileges_after_socket_binding; use common::State; pub fn run(config: Config) -> ::anyhow::Result<()> { - if config.core_affinity.set_affinities { + if config.cpu_pinning.active { core_affinity::set_for_current(core_affinity::CoreId { - id: config.core_affinity.offset, + id: config.cpu_pinning.offset, }); } @@ -66,9 +66,9 @@ pub fn start_workers( Builder::new() .name(format!("request-{:02}", i + 1)) .spawn(move || { - if config.core_affinity.set_affinities { + if config.cpu_pinning.active { core_affinity::set_for_current(core_affinity::CoreId { - id: config.core_affinity.offset + 1 + i, + id: config.cpu_pinning.offset + 1 + i, }); } @@ -87,9 +87,9 @@ pub fn start_workers( Builder::new() .name(format!("socket-{:02}", i + 1)) .spawn(move || { - if config.core_affinity.set_affinities { + if config.cpu_pinning.active { core_affinity::set_for_current(core_affinity::CoreId { - id: config.core_affinity.offset + 1 + config.request_workers + i, + id: config.cpu_pinning.offset + 1 + config.request_workers + i, }); } @@ -112,9 +112,9 @@ pub fn start_workers( Builder::new() .name("statistics-collector".to_string()) .spawn(move || { - if config.core_affinity.set_affinities { + if config.cpu_pinning.active { core_affinity::set_for_current(core_affinity::CoreId { - id: config.core_affinity.offset, + id: config.cpu_pinning.offset, }); }