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

Rename CoreAffinityConfig to CpuPinningConfig, rename fields

Browse source
This commit is contained in:
Joakim Frostegård 2021-10-27 20:21:11 +02:00
parent d659117ae5
commit 35b8a1820d
6 changed files with 30 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

8
aquatic_common/src/cpu_pinning.rs
View file

@ -2,15 +2,15 @@ use serde::{Serialize, Deserialize};
#[derive(Clone, Debug, Serialize, Deserialize)] #[derive(Clone, Debug, Serialize, Deserialize)]
#[serde(default)] #[serde(default)]
pub struct CoreAffinityConfig { pub struct CpuPinningConfig {
pub set_affinities: bool, pub active: bool,
pub offset: usize, pub offset: usize,
} }
impl Default for CoreAffinityConfig { impl Default for CpuPinningConfig {
fn default() -> Self { fn default() -> Self {
Self { Self {
set_affinities: false, active: false,
offset: 0, offset: 0,
} }
} }

6
aquatic_http/src/lib/config.rs
View file

@ -1,7 +1,7 @@
use std::{net::SocketAddr, path::PathBuf}; use std::{net::SocketAddr, path::PathBuf};
use aquatic_common::access_list::AccessListConfig; use aquatic_common::access_list::AccessListConfig;
use aquatic_common::cpu_pinning::CoreAffinityConfig; use aquatic_common::cpu_pinning::CpuPinningConfig;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use aquatic_cli_helpers::LogLevel; use aquatic_cli_helpers::LogLevel;
@ -24,7 +24,7 @@ pub struct Config {
pub statistics: StatisticsConfig, pub statistics: StatisticsConfig,
pub privileges: PrivilegeConfig, pub privileges: PrivilegeConfig,
pub access_list: AccessListConfig, pub access_list: AccessListConfig,
pub core_affinity: CoreAffinityConfig, pub cpu_pinning: CpuPinningConfig,
} }
impl aquatic_cli_helpers::Config for Config { impl aquatic_cli_helpers::Config for Config {
@ -118,7 +118,7 @@ impl Default for Config {
statistics: StatisticsConfig::default(), statistics: StatisticsConfig::default(),
privileges: PrivilegeConfig::default(), privileges: PrivilegeConfig::default(),
access_list: AccessListConfig::default(), access_list: AccessListConfig::default(),
core_affinity: CoreAffinityConfig::default(), cpu_pinning: CpuPinningConfig::default(),
} }
} }
} }

12
aquatic_http/src/lib/glommio/mod.rs
View file

@ -16,9 +16,9 @@ mod network;
const SHARED_CHANNEL_SIZE: usize = 1024; const SHARED_CHANNEL_SIZE: usize = 1024;
pub fn run(config: Config) -> anyhow::Result<()> { 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 { 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(); 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 + i); builder = builder.pin_to_cpu(config.cpu_pinning.offset + 1 + i);
} }
let executor = builder.spawn(|| async move { let executor = builder.spawn(|| async move {
@ -76,9 +76,9 @@ pub fn run(config: Config) -> anyhow::Result<()> {
let mut builder = LocalExecutorBuilder::default(); let mut builder = LocalExecutorBuilder::default();
if config.core_affinity.set_affinities { if config.cpu_pinning.active {
builder = 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 { let executor = builder.spawn(|| async move {

6
aquatic_udp/src/lib/config.rs
View file

@ -1,7 +1,7 @@
use std::net::SocketAddr; use std::net::SocketAddr;
use aquatic_common::access_list::AccessListConfig; use aquatic_common::access_list::AccessListConfig;
use aquatic_common::cpu_pinning::CoreAffinityConfig; use aquatic_common::cpu_pinning::CpuPinningConfig;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use aquatic_cli_helpers::LogLevel; use aquatic_cli_helpers::LogLevel;
@ -26,7 +26,7 @@ pub struct Config {
pub cleaning: CleaningConfig, pub cleaning: CleaningConfig,
pub privileges: PrivilegeConfig, pub privileges: PrivilegeConfig,
pub access_list: AccessListConfig, pub access_list: AccessListConfig,
pub core_affinity: CoreAffinityConfig, pub cpu_pinning: CpuPinningConfig,
} }
impl aquatic_cli_helpers::Config for Config { impl aquatic_cli_helpers::Config for Config {
@ -125,7 +125,7 @@ impl Default for Config {
cleaning: CleaningConfig::default(), cleaning: CleaningConfig::default(),
privileges: PrivilegeConfig::default(), privileges: PrivilegeConfig::default(),
access_list: AccessListConfig::default(), access_list: AccessListConfig::default(),
core_affinity: CoreAffinityConfig::default(), cpu_pinning: CpuPinningConfig::default(),
} }
} }
} }

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

@ -14,9 +14,9 @@ pub mod network;
pub const SHARED_CHANNEL_SIZE: usize = 4096; pub const SHARED_CHANNEL_SIZE: usize = 4096;
pub fn run(config: Config) -> anyhow::Result<()> { 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 { 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(); 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 + i); builder = builder.pin_to_cpu(config.cpu_pinning.offset + 1 + i);
} }
let executor = builder.spawn(|| async move { let executor = builder.spawn(|| async move {
@ -70,9 +70,9 @@ pub fn run(config: Config) -> anyhow::Result<()> {
let mut builder = LocalExecutorBuilder::default(); let mut builder = LocalExecutorBuilder::default();
if config.core_affinity.set_affinities { if config.cpu_pinning.active {
builder = 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 { let executor = builder.spawn(|| async move {

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

@ -21,9 +21,9 @@ use crate::drop_privileges_after_socket_binding;
use common::State; use common::State;
pub fn run(config: Config) -> ::anyhow::Result<()> { 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 { 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() Builder::new()
.name(format!("request-{:02}", i + 1)) .name(format!("request-{:02}", i + 1))
.spawn(move || { .spawn(move || {
if config.core_affinity.set_affinities { if config.cpu_pinning.active {
core_affinity::set_for_current(core_affinity::CoreId { 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() Builder::new()
.name(format!("socket-{:02}", i + 1)) .name(format!("socket-{:02}", i + 1))
.spawn(move || { .spawn(move || {
if config.core_affinity.set_affinities { if config.cpu_pinning.active {
core_affinity::set_for_current(core_affinity::CoreId { 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() Builder::new()
.name("statistics-collector".to_string()) .name("statistics-collector".to_string())
.spawn(move || { .spawn(move || {
if config.core_affinity.set_affinities { if config.cpu_pinning.active {
core_affinity::set_for_current(core_affinity::CoreId { core_affinity::set_for_current(core_affinity::CoreId {
id: config.core_affinity.offset, id: config.cpu_pinning.offset,
}); });
} }