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

Fix ws and http build errors, fix ws thread name

Browse source
This commit is contained in:
Joakim Frostegård 2024-02-03 23:53:13 +01:00
parent a4f7c816d0
commit c4f645e03e
4 changed files with 2 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

3
crates/http_load_test/src/config.rs
View file

@ -1,7 +1,6 @@
use std::net::SocketAddr; use std::net::SocketAddr;
use aquatic_common::cli::LogLevel; use aquatic_common::cli::LogLevel;
use aquatic_common::cpu_pinning::desc::CpuPinningConfigDesc;
use aquatic_toml_config::TomlConfig; use aquatic_toml_config::TomlConfig;
use serde::Deserialize; use serde::Deserialize;
@ -25,7 +24,6 @@ pub struct Config {
pub keep_alive: bool, pub keep_alive: bool,
pub enable_tls: bool, pub enable_tls: bool,
pub torrents: TorrentConfig, pub torrents: TorrentConfig,
pub cpu_pinning: CpuPinningConfigDesc,
} }
impl aquatic_common::cli::Config for Config { impl aquatic_common::cli::Config for Config {
@ -47,7 +45,6 @@ impl Default for Config {
keep_alive: true, keep_alive: true,
enable_tls: true, enable_tls: true,
torrents: TorrentConfig::default(), torrents: TorrentConfig::default(),
cpu_pinning: Default::default(),
} }
} }
} }

2
crates/ws/Cargo.toml
View file

@ -19,7 +19,7 @@ name = "aquatic_ws"
[features] [features]
default = ["prometheus", "mimalloc"] default = ["prometheus", "mimalloc"]
prometheus = ["metrics", "metrics-exporter-prometheus"] prometheus = ["metrics", "aquatic_common/prometheus"]
metrics = ["dep:metrics", "metrics-util"] metrics = ["dep:metrics", "metrics-util"]
# Use mimalloc allocator for much better performance. Requires cmake and a # Use mimalloc allocator for much better performance. Requires cmake and a
# C/C++ compiler # C/C++ compiler

2
crates/ws/src/lib.rs
View file

@ -109,7 +109,7 @@ pub fn run(config: Config) -> ::anyhow::Result<()> {
let response_mesh_builder = response_mesh_builder.clone(); let response_mesh_builder = response_mesh_builder.clone();
let handle = Builder::new() let handle = Builder::new()
.name(format!("socket-{:02}", i + 1)) .name(format!("swarm-{:02}", i + 1))
.spawn(move || { .spawn(move || {
LocalExecutorBuilder::default() LocalExecutorBuilder::default()
.make() .make()

3
crates/ws_load_test/src/config.rs
View file

@ -1,7 +1,6 @@
use std::net::SocketAddr; use std::net::SocketAddr;
use aquatic_common::cli::LogLevel; use aquatic_common::cli::LogLevel;
use aquatic_common::cpu_pinning::desc::CpuPinningConfigDesc;
use aquatic_toml_config::TomlConfig; use aquatic_toml_config::TomlConfig;
use serde::Deserialize; use serde::Deserialize;
@ -17,7 +16,6 @@ pub struct Config {
pub duration: usize, pub duration: usize,
pub measure_after_max_connections_reached: bool, pub measure_after_max_connections_reached: bool,
pub torrents: TorrentConfig, pub torrents: TorrentConfig,
pub cpu_pinning: CpuPinningConfigDesc,
} }
impl aquatic_common::cli::Config for Config { impl aquatic_common::cli::Config for Config {
@ -37,7 +35,6 @@ impl Default for Config {
duration: 0, duration: 0,
measure_after_max_connections_reached: true, measure_after_max_connections_reached: true,
torrents: TorrentConfig::default(), torrents: TorrentConfig::default(),
cpu_pinning: Default::default(),
} }
} }
} }