diff --git a/Cargo.lock b/Cargo.lock index be9ff5555cc..3f78cc5c196 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -344,9 +344,9 @@ dependencies = [ "boa_engine", "boa_runtime", "criterion", - "jemallocator", "mimalloc-safe", "regex", + "tikv-jemallocator", "walkdir", ] @@ -365,7 +365,6 @@ dependencies = [ "cow-utils", "dhat", "futures-concurrency", - "jemallocator", "mimalloc-safe", "phf", "regex", @@ -373,6 +372,7 @@ dependencies = [ "rustyline", "serde_json", "smol", + "tikv-jemallocator", "unsend", ] @@ -426,7 +426,6 @@ dependencies = [ "indoc", "intrusive-collections", "itertools 0.15.0", - "jemallocator", "lz4_flex", "num-bigint 0.5.1", "num-integer", @@ -451,6 +450,7 @@ dependencies = [ "textwrap", "thin-vec", "thiserror", + "tikv-jemallocator", "time", "timezone_provider", "tinystr", @@ -2421,26 +2421,6 @@ version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4d3667095d64c3ecffc96463a21157b04bf3e252f6e8d5750b20c02e33c194e3" -[[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 = "jni" version = "0.22.4" @@ -4031,6 +4011,26 @@ dependencies = [ "cfg-if", ] +[[package]] +name = "tikv-jemalloc-sys" +version = "0.7.1+5.3.1-0-g81034ce1f1373e37dc865038e1bc8eeecf559ce8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a2825c78386b4ae0314074867860ba9577875de945f05992c38815cbec327f0" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "tikv-jemallocator" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "249f09e49ab1609436f34c776e84231bead18d6a955f119f939bdc1d847561bd" +dependencies = [ + "libc", + "tikv-jemalloc-sys", +] + [[package]] name = "time" version = "0.3.55" diff --git a/Cargo.toml b/Cargo.toml index f7173c31bc6..8a1e184138e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -65,7 +65,7 @@ iana-time-zone = "0.1.65" indexmap = { version = "2.14.0", default-features = false } indoc = "2.0.7" itoa = "1.0.18" -jemallocator = "0.5.4" +tikv-jemallocator = "0.7" mimalloc-safe = "0.1.65" lz4_flex = "0.14.0" num-bigint = "0.5.1" diff --git a/benches/Cargo.toml b/benches/Cargo.toml index e5cc3d83dda..c6213228471 100644 --- a/benches/Cargo.toml +++ b/benches/Cargo.toml @@ -14,7 +14,7 @@ walkdir = "2" regex.workspace = true [target.x86_64-unknown-linux-gnu.dev-dependencies] -jemallocator.workspace = true +tikv-jemallocator.workspace = true [target.'cfg(target_os = "macos")'.dev-dependencies] mimalloc-safe = { workspace = true, features = ["skip_collect_on_exit"] } diff --git a/benches/benches/scripts.rs b/benches/benches/scripts.rs index 77d2b8ba2ec..12e175210c3 100644 --- a/benches/benches/scripts.rs +++ b/benches/benches/scripts.rs @@ -8,7 +8,7 @@ use std::{path::Path, time::Duration}; #[cfg(all(target_arch = "x86_64", target_os = "linux", target_env = "gnu"))] #[global_allocator] -static ALLOC: jemallocator::Jemalloc = jemallocator::Jemalloc; +static ALLOC: tikv_jemallocator::Jemalloc = tikv_jemallocator::Jemalloc; #[cfg(target_os = "macos")] #[global_allocator] diff --git a/cli/Cargo.toml b/cli/Cargo.toml index 39d5b7bd706..2c466c9995d 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -42,11 +42,11 @@ default = [ "fetch", ] dhat = ["dep:dhat"] -fast-allocator = ["dep:mimalloc-safe", "dep:jemallocator"] +fast-allocator = ["dep:mimalloc-safe", "dep:tikv-jemallocator"] fetch = ["boa_runtime/fetch", "boa_runtime/reqwest-blocking"] [target.x86_64-unknown-linux-gnu.dependencies] -jemallocator = { workspace = true, optional = true } +tikv-jemallocator = { workspace = true, optional = true } [target.'cfg(any(target_os = "windows", target_os = "macos"))'.dependencies] mimalloc-safe = { workspace = true, optional = true, features = [ diff --git a/cli/src/main.rs b/cli/src/main.rs index ae36d754f23..7bab7112c27 100644 --- a/cli/src/main.rs +++ b/cli/src/main.rs @@ -53,7 +53,7 @@ use std::{ target_env = "gnu", feature = "dhat" ))] -use jemallocator as _; +use tikv_jemallocator as _; #[cfg(all( target_arch = "x86_64", @@ -63,7 +63,7 @@ use jemallocator as _; not(feature = "dhat") ))] #[global_allocator] -static ALLOC: jemallocator::Jemalloc = jemallocator::Jemalloc; +static ALLOC: tikv_jemallocator::Jemalloc = tikv_jemallocator::Jemalloc; #[cfg(all(any(target_os = "windows", target_os = "macos"), feature = "dhat"))] use mimalloc_safe as _; diff --git a/core/engine/Cargo.toml b/core/engine/Cargo.toml index b6fcb5925b9..04c0329c3cf 100644 --- a/core/engine/Cargo.toml +++ b/core/engine/Cargo.toml @@ -208,7 +208,7 @@ test-case.workspace = true husky-rs.workspace = true [target.x86_64-unknown-linux-gnu.dev-dependencies] -jemallocator.workspace = true +tikv-jemallocator.workspace = true [lib] crate-type = ["cdylib", "lib"] diff --git a/core/engine/benches/full.rs b/core/engine/benches/full.rs index b327a366991..d10f67351b1 100644 --- a/core/engine/benches/full.rs +++ b/core/engine/benches/full.rs @@ -14,7 +14,7 @@ use std::hint::black_box; all(target_arch = "x86_64", target_os = "linux", target_env = "gnu"), global_allocator )] -static ALLOC: jemallocator::Jemalloc = jemallocator::Jemalloc; +static ALLOC: tikv_jemallocator::Jemalloc = tikv_jemallocator::Jemalloc; fn create_realm(c: &mut Criterion) { c.bench_function("Create Realm", move |b| {