From d8a9b450a6b5190effbe606dc8c49af726f93000 Mon Sep 17 00:00:00 2001 From: John Renner Date: Fri, 7 May 2021 12:17:37 -0700 Subject: [PATCH 1/2] Switch from jemalloc to tikv-jemalloc --- Cargo.lock | 68 ++++++++++++++++----------------- crates/profile/Cargo.toml | 4 +- crates/rust-analyzer/Cargo.toml | 4 +- 3 files changed, 38 insertions(+), 38 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c378014f008..f3a512a8a79 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -749,38 +749,6 @@ version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736" -[[package]] -name = "jemalloc-ctl" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c502a5ff9dd2924f1ed32ba96e3b65735d837b4bfd978d3161b1702e66aca4b7" -dependencies = [ - "jemalloc-sys", - "libc", - "paste", -] - -[[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 = "jod-thread" version = "0.1.2" @@ -1201,11 +1169,11 @@ version = "0.0.0" dependencies = [ "cfg-if", "countme", - "jemalloc-ctl", "la-arena", "libc", "once_cell", "perf-event", + "tikv-jemalloc-ctl", ] [[package]] @@ -1349,7 +1317,6 @@ dependencies = [ "ide_db", "ide_ssr", "itertools", - "jemallocator", "jod-thread", "log", "lsp-server", @@ -1371,6 +1338,7 @@ dependencies = [ "test_utils", "text_edit", "threadpool", + "tikv-jemallocator", "toolchain", "tracing", "tracing-subscriber", @@ -1669,6 +1637,38 @@ dependencies = [ "num_cpus", ] +[[package]] +name = "tikv-jemalloc-ctl" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f28c80e4338857639f443169a601fafe49866aed8d7a8d565c2f5bfb1a021adf" +dependencies = [ + "libc", + "paste", + "tikv-jemalloc-sys", +] + +[[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 = "tinyvec" version = "1.2.0" diff --git a/crates/profile/Cargo.toml b/crates/profile/Cargo.toml index 486f9c16417..98df79a8f78 100644 --- a/crates/profile/Cargo.toml +++ b/crates/profile/Cargo.toml @@ -15,14 +15,14 @@ cfg-if = "1" libc = "0.2.73" la-arena = { version = "0.2.0", path = "../../lib/arena" } countme = { version = "2.0.1", features = ["enable"] } -jemalloc-ctl = { version = "0.3.3", optional = true } +tikv-jemalloc-ctl = { version = "0.4.1", optional = true } [target.'cfg(target_os = "linux")'.dependencies] perf-event = "0.4" [features] cpu_profiler = [] -jemalloc = ["jemalloc-ctl"] +jemalloc = ["tikv-jemalloc-ctl"] # Uncomment to enable for the whole crate graph # default = [ "cpu_profiler" ] diff --git a/crates/rust-analyzer/Cargo.toml b/crates/rust-analyzer/Cargo.toml index 3e8f4bf8985..4b40e41ac4a 100644 --- a/crates/rust-analyzer/Cargo.toml +++ b/crates/rust-analyzer/Cargo.toml @@ -63,7 +63,7 @@ proc_macro_srv = { path = "../proc_macro_srv", version = "0.0.0" } winapi = "0.3.8" [target.'cfg(not(target_env = "msvc"))'.dependencies] -jemallocator = { version = "0.3.2", optional = true } +tikv-jemallocator = { version = "0.4.1", optional = true } [dev-dependencies] expect-test = "1.1" @@ -72,5 +72,5 @@ mbe = { path = "../mbe" } tt = { path = "../tt" } [features] -jemalloc = ["jemallocator", "profile/jemalloc"] +jemalloc = ["tikv-jemallocator", "profile/jemalloc"] force-always-assert = ["always-assert/force"] From 4059112b4e6fbe6fd1b9c6640c031a2c346f6225 Mon Sep 17 00:00:00 2001 From: John Renner Date: Fri, 7 May 2021 12:41:07 -0700 Subject: [PATCH 2/2] Use package renaming so source doesn't say tikv --- crates/profile/Cargo.toml | 4 ++-- crates/rust-analyzer/Cargo.toml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/crates/profile/Cargo.toml b/crates/profile/Cargo.toml index 98df79a8f78..1a8c8f862c2 100644 --- a/crates/profile/Cargo.toml +++ b/crates/profile/Cargo.toml @@ -15,14 +15,14 @@ cfg-if = "1" libc = "0.2.73" la-arena = { version = "0.2.0", path = "../../lib/arena" } countme = { version = "2.0.1", features = ["enable"] } -tikv-jemalloc-ctl = { version = "0.4.1", optional = true } +jemalloc-ctl = { version = "0.4.1", package = "tikv-jemalloc-ctl", optional = true } [target.'cfg(target_os = "linux")'.dependencies] perf-event = "0.4" [features] cpu_profiler = [] -jemalloc = ["tikv-jemalloc-ctl"] +jemalloc = ["jemalloc-ctl"] # Uncomment to enable for the whole crate graph # default = [ "cpu_profiler" ] diff --git a/crates/rust-analyzer/Cargo.toml b/crates/rust-analyzer/Cargo.toml index 4b40e41ac4a..3010815df7f 100644 --- a/crates/rust-analyzer/Cargo.toml +++ b/crates/rust-analyzer/Cargo.toml @@ -63,7 +63,7 @@ proc_macro_srv = { path = "../proc_macro_srv", version = "0.0.0" } winapi = "0.3.8" [target.'cfg(not(target_env = "msvc"))'.dependencies] -tikv-jemallocator = { version = "0.4.1", optional = true } +jemallocator = { version = "0.4.1", package = "tikv-jemallocator", optional = true } [dev-dependencies] expect-test = "1.1" @@ -72,5 +72,5 @@ mbe = { path = "../mbe" } tt = { path = "../tt" } [features] -jemalloc = ["tikv-jemallocator", "profile/jemalloc"] +jemalloc = ["jemallocator", "profile/jemalloc"] force-always-assert = ["always-assert/force"]