feat: only use mimalloc;

mycrl · Mar 16, 2024 · 986dd49 · 986dd49
1 parent 135008a
commit 986dd49
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 44 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/turn-balance/Cargo.toml b/turn-balance/Cargo.toml
@@ -15,15 +15,10 @@ bytes = "1.5.0"
 log = "0.4.20"
 simple_logger = "4.3.0"
 num_cpus = "1.15"
+mimalloc = { version = "*", default-features = false }
 
 [build-dependencies]
 prost-build = "0.12"
 
-[target.'cfg(not(target_os = "windows"))'.dependencies]
-jemallocator = "0.5.4"
-
-[target.'cfg(target_os = "windows")'.dependencies]
-mimalloc = "0.1.37"
-
 [features]
 system_allocator = []
diff --git a/turn-balance/src/main.rs b/turn-balance/src/main.rs
@@ -1,11 +1,7 @@
 #[global_allocator]
-#[cfg(all(target_os = "windows", not(feature = "system_allocator")))]
+#[cfg(not(feature = "system_allocator"))]
 static GLOBAL: mimalloc::MiMalloc = mimalloc::MiMalloc;
 
-#[global_allocator]
-#[cfg(all(not(target_os = "windows"), not(feature = "system_allocator")))]
-static GLOBAL: jemallocator::Jemalloc = jemallocator::Jemalloc;
-
 mod cluster;
 mod config;
 

diff --git a/turn-server/Cargo.toml b/turn-server/Cargo.toml
@@ -36,15 +36,10 @@ anyhow = "1.0"
 toml = "0.7"
 tonic = { version = "0.10", features = ["prost", "gzip", "tls"] }
 prost = "0.12"
+mimalloc = { version = "*", default-features = false }
 
 [build-dependencies]
 tonic-build = "0.10"
 
-[target.'cfg(not(target_os = "windows"))'.dependencies]
-jemallocator = "0.5.4"
-
-[target.'cfg(target_os = "windows")'.dependencies]
-mimalloc = "0.1.37"
-
 [features]
 system_allocator = []
diff --git a/turn-server/src/main.rs b/turn-server/src/main.rs
@@ -1,11 +1,7 @@
 #[global_allocator]
-#[cfg(all(target_os = "windows", not(feature = "system_allocator")))]
+#[cfg(not(feature = "system_allocator"))]
 static GLOBAL: mimalloc::MiMalloc = mimalloc::MiMalloc;
 
-#[global_allocator]
-#[cfg(all(not(target_os = "windows"), not(feature = "system_allocator")))]
-static GLOBAL: jemallocator::Jemalloc = jemallocator::Jemalloc;
-
 use std::sync::Arc;
 use turn_server::config::Config;