diff --git a/Cargo.lock b/Cargo.lock index 15f8ff76212bd..64fbdfaf1f031 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3044,27 +3044,6 @@ version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736" -[[package]] -name = "jemalloc-sys" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d3b9f3f5c9b31aa0f5ed3260385ac205db665baa41d49bb8338008ae94ede45" -dependencies = [ - "cc", - "fs_extra", - "libc", -] - -[[package]] -name = "jemallocator" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43ae63fcfc45e99ab3d1b29a46782ad679e98436c3169d15a167a1108a724b69" -dependencies = [ - "jemalloc-sys", - "libc", -] - [[package]] name = "jobserver" version = "0.1.21" @@ -6706,6 +6685,27 @@ dependencies = [ "lazy_static", ] +[[package]] +name = "tikv-jemalloc-sys" +version = "0.4.1+5.2.1-patched" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a26331b05179d4cb505c8d6814a7e18d298972f0a551b0e3cefccff927f86d3" +dependencies = [ + "cc", + "fs_extra", + "libc", +] + +[[package]] +name = "tikv-jemallocator" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c14a5a604eb8715bc5785018a37d00739b180bcf609916ddf4393d33d49ccdf" +dependencies = [ + "libc", + "tikv-jemalloc-sys", +] + [[package]] name = "time" version = "0.1.44" @@ -7588,7 +7588,6 @@ dependencies = [ "indoc", "inventory", "itertools 0.10.0", - "jemallocator", "k8s-openapi", "lazy_static", "leveldb", @@ -7672,6 +7671,7 @@ dependencies = [ "syslog_loose", "tempfile", "thread_local", + "tikv-jemallocator", "tokio", "tokio-openssl", "tokio-postgres", diff --git a/Cargo.toml b/Cargo.toml index 6f79426a016a1..61d85bfa9b3f3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -158,7 +158,7 @@ rdkafka = { version = "0.24.0", features = ["libz", "ssl", "zstd"], optional = t hostname = "0.3.1" seahash = { version = "4.0.1", optional = true } semver = { version = "0.11.0", features = ["serde"] } -jemallocator = { version = "0.3.0", optional = true } +tikv-jemallocator = { version = "0.4.0", optional = true } lazy_static = "1.3.0" rlua = { git = "https://github.com/kyren/rlua", rev = "25bd7e6bffef9597466a98bfca80a3056c9e6320", optional = true } num_cpus = "1.10.0" @@ -283,7 +283,7 @@ target-armv7-unknown-linux-musleabihf = ["api", "api-client", "sources", "transf target-armv7-unknown-linux-gnueabihf = ["api", "api-client", "sources", "transforms", "sinks", "vendor-openssl", "vendor-libz", "unix", "leveldb", "rdkafka-cmake"] # Enables features that work only on systems providing `cfg(unix)` -unix = ["jemallocator"] +unix = ["tikv-jemallocator"] # These are **very** useful on Cross compilations! vendor-all = ["vendor-sasl", "vendor-openssl", "vendor-libz"] vendor-sasl = ["rdkafka/gssapi-vendored"] diff --git a/src/lib.rs b/src/lib.rs index d716b9ba1e649..949232117da28 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -20,9 +20,9 @@ extern crate pest_derive; #[cfg(feature = "vrl-cli")] extern crate remap_cli; -#[cfg(feature = "jemallocator")] +#[cfg(feature = "tikv_jemallocator")] #[global_allocator] -static ALLOC: jemallocator::Jemalloc = jemallocator::Jemalloc; +static ALLOC: tikv_jemallocator::Jemalloc = tikv_jemallocator::Jemalloc; #[macro_use] pub mod config;