Replace jemalloc with mimalloc (#350)

* Replace jemalloc with mimalloc * use mimalloc for job runner
kitsune-soc · Sep 18, 2023 · 7eee8ef · 7eee8ef
1 parent 2e0bd1d
commit 7eee8ef
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 30 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/kitsune-job-runner/Cargo.toml b/kitsune-job-runner/Cargo.toml
@@ -11,6 +11,7 @@ deadpool-redis = "0.12.0"
 just-retry = { path = "../lib/just-retry" }
 kitsune-core = { path = "../crates/kitsune-core" }
 kitsune-db = { path = "../crates/kitsune-db" }
+mimalloc = "0.1.39"
 tokio = { version = "1.32.0", features = ["full"] }
 toml = "0.8.0"
 tracing = "0.1.37"

diff --git a/kitsune-job-runner/src/main.rs b/kitsune-job-runner/src/main.rs
@@ -4,6 +4,9 @@ use kitsune_core::{config::Configuration, consts::VERSION};
 use std::path::PathBuf;
 use tokio::fs;
 
+#[global_allocator]
+static GLOBAL: mimalloc::MiMalloc = mimalloc::MiMalloc;
+
 /// Dedicated Kitsune job runner
 #[derive(Parser)]
 #[command(about, author, version = VERSION)]

diff --git a/kitsune-search-server/Cargo.toml b/kitsune-search-server/Cargo.toml
@@ -11,14 +11,12 @@ dotenvy = "0.15.7"
 envy = "0.4.2"
 futures-util = "0.3.28"
 human-size = { version = "0.4.3", features = ["serde"] }
-tikv-jemallocator = { version = "0.5.4", default-features = false, features = [
-    "background_threads",
-] }
 kitsune-search-proto = { path = "proto" }
 metrics = "0.21.1"
 metrics-exporter-prometheus = "0.12.1"
 metrics-tracing-context = "0.14.0"
 metrics-util = "0.15.1"
+mimalloc = "0.1.39"
 prost = "0.12.1"
 serde = { version = "1.0.188", features = ["derive"] }
 tantivy = "0.21.0"

diff --git a/kitsune-search-server/src/main.rs b/kitsune-search-server/src/main.rs
@@ -18,7 +18,7 @@ use tracing::metadata::LevelFilter;
 use tracing_subscriber::{filter::Targets, layer::SubscriberExt, Layer as _, Registry};
 
 #[global_allocator]
-static GLOBAL: tikv_jemallocator::Jemalloc = tikv_jemallocator::Jemalloc;
+static GLOBAL: mimalloc::MiMalloc = mimalloc::MiMalloc;
 
 const STARTUP_FIGLET: &str = r#"
 ┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓

diff --git a/kitsune/Cargo.toml b/kitsune/Cargo.toml
@@ -42,12 +42,10 @@ http = "0.2.9"
 human-panic = "1.2.0"
 hyper = { version = "0.14.27", features = ["deprecated"] }
 iso8601-timestamp = "0.2.11"
+mimalloc = "0.1.39"
 mime = "0.3.17"
 mime_guess = { version = "2.0.4", default-features = false }
 pkcs8 = "0.10.2"
-tikv-jemallocator = { version = "0.5.4", default-features = false, features = [
-    "background_threads",
-] }
 kitsune-cache = { path = "../crates/kitsune-cache" }
 kitsune-captcha = { path = "../crates/kitsune-captcha" }
 kitsune-core = { path = "../crates/kitsune-core" }

diff --git a/kitsune/src/main.rs b/kitsune/src/main.rs
@@ -18,7 +18,7 @@ use tracing_subscriber::{filter::Targets, layer::SubscriberExt, Layer, Registry}
 use url::Url;
 
 #[global_allocator]
-static GLOBAL: tikv_jemallocator::Jemalloc = tikv_jemallocator::Jemalloc;
+static GLOBAL: mimalloc::MiMalloc = mimalloc::MiMalloc;
 
 fn install_handlers() -> eyre::Result<()> {
     let (eyre_panic_hook, eyre_hook) = HookBuilder::new().into_hooks();