From c4f645e03e6fde3b1fdfcffd738174b7a3b50eb5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joakim=20Frosteg=C3=A5rd?= <joakim.frostegard@gmail.com>
Date: Sat, 3 Feb 2024 23:53:13 +0100
Subject: [PATCH] Fix ws and http build errors, fix ws thread name

---
 crates/http_load_test/src/config.rs | 3 ---
 crates/ws/Cargo.toml                | 2 +-
 crates/ws/src/lib.rs                | 2 +-
 crates/ws_load_test/src/config.rs   | 3 ---
 4 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/crates/http_load_test/src/config.rs b/crates/http_load_test/src/config.rs
index b41d58a..a372f68 100644
--- a/crates/http_load_test/src/config.rs
+++ b/crates/http_load_test/src/config.rs
@@ -1,7 +1,6 @@
 use std::net::SocketAddr;
 
 use aquatic_common::cli::LogLevel;
-use aquatic_common::cpu_pinning::desc::CpuPinningConfigDesc;
 use aquatic_toml_config::TomlConfig;
 use serde::Deserialize;
 
@@ -25,7 +24,6 @@ pub struct Config {
     pub keep_alive: bool,
     pub enable_tls: bool,
     pub torrents: TorrentConfig,
-    pub cpu_pinning: CpuPinningConfigDesc,
 }
 
 impl aquatic_common::cli::Config for Config {
@@ -47,7 +45,6 @@ impl Default for Config {
             keep_alive: true,
             enable_tls: true,
             torrents: TorrentConfig::default(),
-            cpu_pinning: Default::default(),
         }
     }
 }
diff --git a/crates/ws/Cargo.toml b/crates/ws/Cargo.toml
index 5f4f7fb..67a07f7 100644
--- a/crates/ws/Cargo.toml
+++ b/crates/ws/Cargo.toml
@@ -19,7 +19,7 @@ name = "aquatic_ws"
 
 [features]
 default = ["prometheus", "mimalloc"]
-prometheus = ["metrics", "metrics-exporter-prometheus"]
+prometheus = ["metrics", "aquatic_common/prometheus"]
 metrics = ["dep:metrics", "metrics-util"]
 # Use mimalloc allocator for much better performance. Requires cmake and a
 # C/C++ compiler
diff --git a/crates/ws/src/lib.rs b/crates/ws/src/lib.rs
index cfaaaad..41ff53b 100644
--- a/crates/ws/src/lib.rs
+++ b/crates/ws/src/lib.rs
@@ -109,7 +109,7 @@ pub fn run(config: Config) -> ::anyhow::Result<()> {
         let response_mesh_builder = response_mesh_builder.clone();
 
         let handle = Builder::new()
-            .name(format!("socket-{:02}", i + 1))
+            .name(format!("swarm-{:02}", i + 1))
             .spawn(move || {
                 LocalExecutorBuilder::default()
                     .make()
diff --git a/crates/ws_load_test/src/config.rs b/crates/ws_load_test/src/config.rs
index 3f3169d..cd759e9 100644
--- a/crates/ws_load_test/src/config.rs
+++ b/crates/ws_load_test/src/config.rs
@@ -1,7 +1,6 @@
 use std::net::SocketAddr;
 
 use aquatic_common::cli::LogLevel;
-use aquatic_common::cpu_pinning::desc::CpuPinningConfigDesc;
 use aquatic_toml_config::TomlConfig;
 use serde::Deserialize;
 
@@ -17,7 +16,6 @@ pub struct Config {
     pub duration: usize,
     pub measure_after_max_connections_reached: bool,
     pub torrents: TorrentConfig,
-    pub cpu_pinning: CpuPinningConfigDesc,
 }
 
 impl aquatic_common::cli::Config for Config {
@@ -37,7 +35,6 @@ impl Default for Config {
             duration: 0,
             measure_after_max_connections_reached: true,
             torrents: TorrentConfig::default(),
-            cpu_pinning: Default::default(),
         }
     }
 }