diff --git a/Cargo.lock b/Cargo.lock index 5cdd166..2c554be 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -400,10 +400,10 @@ dependencies = [ "cave", "chrono", "futures", - "jemallocator", "metrics", "metrics-exporter-prometheus", "metrics-util", + "mimalloc", "rand", "reqwest", "serde", @@ -1099,26 +1099,6 @@ version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" -[[package]] -name = "jemalloc-sys" -version = "0.5.4+5.3.0-patched" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac6c1946e1cea1788cbfde01c993b52a10e2da07f4bac608228d1bed20bfebf2" -dependencies = [ - "cc", - "libc", -] - -[[package]] -name = "jemallocator" -version = "0.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0de374a9f8e63150e6f5e8a60cc14c668226d7a347d8aee1a45766e3c4dd3bc" -dependencies = [ - "jemalloc-sys", - "libc", -] - [[package]] name = "js-sys" version = "0.3.64" @@ -1140,6 +1120,16 @@ version = "0.2.148" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9cdc71e17332e86d2e1d38c1f99edcb6288ee11b815fb1a4b049eaa2114d369b" +[[package]] +name = "libmimalloc-sys" +version = "0.1.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3979b5c37ece694f1f5e51e7ecc871fdb0f517ed04ee45f88d15d6d553cb9664" +dependencies = [ + "cc", + "libc", +] + [[package]] name = "libsystemd-sys" version = "0.9.3" @@ -1311,6 +1301,15 @@ dependencies = [ "sketches-ddsketch", ] +[[package]] +name = "mimalloc" +version = "0.1.39" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa01922b5ea280a911e323e4d2fd24b7fe5cc4042e0d2cda3c40775cdc4bdc9c" +dependencies = [ + "libmimalloc-sys", +] + [[package]] name = "mime" version = "0.3.17" diff --git a/hunter/Cargo.toml b/hunter/Cargo.toml index ec72984..f270be5 100644 --- a/hunter/Cargo.toml +++ b/hunter/Cargo.toml @@ -22,6 +22,4 @@ metrics-util = "0.14" metrics-exporter-prometheus = "0.11" serde_json = "1" urlencoding = "1" - -[target.'cfg(not(target_env = "msvc"))'.dependencies] -jemallocator = "0.5" +mimalloc = { version = "*", default-features = false } diff --git a/hunter/src/main.rs b/hunter/src/main.rs index 33fdc66..85bc112 100644 --- a/hunter/src/main.rs +++ b/hunter/src/main.rs @@ -15,9 +15,8 @@ mod webfinger; use scheduler::InstanceHost; use worker::Message; -#[cfg(not(target_env = "msvc"))] #[global_allocator] -static GLOBAL: jemallocator::Jemalloc = jemallocator::Jemalloc; +static GLOBAL: mimalloc::MiMalloc = mimalloc::MiMalloc; fn main() -> Result<(), Box> { tokio_uring::start(async {