From ec56c45f518b7da067996ce32f919297111d0e43 Mon Sep 17 00:00:00 2001 From: Jun Kurihara Date: Fri, 4 Apr 2025 01:51:55 +0900 Subject: [PATCH] pin mimalloc and mimalloc-sys #252 --- Cargo.lock | 21 +++++++++++++++++++++ rpxy-bin/Cargo.toml | 5 +++-- rpxy-bin/src/main.rs | 4 ++-- 3 files changed, 26 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index cef6980..cb4583b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1496,6 +1496,16 @@ version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8355be11b20d696c8f18f6cc018c4e372165b1fa8126cef092399c9951984ffa" +[[package]] +name = "libmimalloc-sys" +version = "0.1.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07d0e07885d6a754b9c7993f2625187ad694ee985d60f23355ff0e7077261502" +dependencies = [ + "cc", + "libc", +] + [[package]] name = "linux-raw-sys" version = "0.4.15" @@ -1553,6 +1563,15 @@ dependencies = [ "autocfg", ] +[[package]] +name = "mimalloc" +version = "0.1.44" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99585191385958383e13f6b822e6b6d8d9cf928e7d286ceb092da92b43c87bc1" +dependencies = [ + "libmimalloc-sys", +] + [[package]] name = "minimal-lexical" version = "0.2.1" @@ -2074,6 +2093,8 @@ dependencies = [ "clap", "futures-util", "hot_reload", + "libmimalloc-sys", + "mimalloc", "rpxy-acme", "rpxy-certs", "rpxy-lib", diff --git a/rpxy-bin/Cargo.toml b/rpxy-bin/Cargo.toml index d6cb213..ff4d503 100644 --- a/rpxy-bin/Cargo.toml +++ b/rpxy-bin/Cargo.toml @@ -29,8 +29,9 @@ rpxy-lib = { path = "../rpxy-lib/", default-features = false, features = [ "sticky-cookie", ] } -# TODO: stop using mimalloc doe to compilation failure by musl -# mimalloc = { version = "*", default-features = false } +# TODO: pin mimalloc due to compilation failure by musl +mimalloc = { version = "=0.1.44", default-features = false } +libmimalloc-sys = { version = "=0.1.40" } anyhow = "1.0.97" ahash = "0.8.11" serde = { version = "1.0.219", default-features = false, features = ["derive"] } diff --git a/rpxy-bin/src/main.rs b/rpxy-bin/src/main.rs index 9af0144..b0bf25e 100644 --- a/rpxy-bin/src/main.rs +++ b/rpxy-bin/src/main.rs @@ -1,5 +1,5 @@ -// #[global_allocator] -// static ALLOC: mimalloc::MiMalloc = mimalloc::MiMalloc; +#[global_allocator] +static ALLOC: mimalloc::MiMalloc = mimalloc::MiMalloc; mod config; mod constants;