Skip to content

Commit 6073f1b

Browse files
committed
Auto merge of #55217 - alexcrichton:alloc-system-and-jemalloc, r=<try>
[wip] more perf data collection for jemalloc + rustc Filling in details on #36963 ...
2 parents 42dde96 + 70437bd commit 6073f1b

File tree

4 files changed

+16
-1
lines changed

4 files changed

+16
-1
lines changed

src/Cargo.lock

+11
Original file line numberDiff line numberDiff line change
@@ -996,6 +996,15 @@ name = "itoa"
996996
version = "0.4.3"
997997
source = "registry+https://github.com/rust-lang/crates.io-index"
998998

999+
[[package]]
1000+
name = "jemalloc-sys"
1001+
version = "0.1.4"
1002+
source = "registry+https://github.com/rust-lang/crates.io-index"
1003+
dependencies = [
1004+
"cc 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)",
1005+
"libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)",
1006+
]
1007+
9991008
[[package]]
10001009
name = "jobserver"
10011010
version = "0.1.11"
@@ -2181,6 +2190,7 @@ dependencies = [
21812190
"arena 0.0.0",
21822191
"env_logger 0.5.12 (registry+https://github.com/rust-lang/crates.io-index)",
21832192
"graphviz 0.0.0",
2193+
"jemalloc-sys 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
21842194
"log 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
21852195
"rustc 0.0.0",
21862196
"rustc-rayon 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3252,6 +3262,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
32523262
"checksum isatty 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "6c324313540cd4d7ba008d43dc6606a32a5579f13cc17b2804c13096f0a5c522"
32533263
"checksum itertools 0.7.8 (registry+https://github.com/rust-lang/crates.io-index)" = "f58856976b776fedd95533137617a02fb25719f40e7d9b01c7043cd65474f450"
32543264
"checksum itoa 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "1306f3464951f30e30d12373d31c79fbd52d236e5e896fd92f96ec7babbbe60b"
3265+
"checksum jemalloc-sys 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "479294d130502fada93c7a957e8d059b632b03d6204aca37af557dee947f30a9"
32553266
"checksum jobserver 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "60af5f849e1981434e4a31d3d782c4774ae9b434ce55b101a96ecfd09147e8be"
32563267
"checksum json 0.11.13 (registry+https://github.com/rust-lang/crates.io-index)" = "9ad0485404155f45cce53a40d4b2d6ac356418300daed05273d9e26f91c390be"
32573268
"checksum jsonrpc-core 8.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ddf83704f4e79979a424d1082dd2c1e52683058056c9280efa19ac5f6bc9033c"

src/librustc_driver/Cargo.toml

+1
Original file line numberDiff line numberDiff line change
@@ -38,3 +38,4 @@ syntax = { path = "../libsyntax" }
3838
smallvec = { version = "0.6.5", features = ["union"] }
3939
syntax_ext = { path = "../libsyntax_ext" }
4040
syntax_pos = { path = "../libsyntax_pos" }
41+
jemalloc-sys = "*"

src/librustc_driver/lib.rs

+2
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@
3030

3131
#![recursion_limit="256"]
3232

33+
extern crate jemalloc_sys;
34+
3335
extern crate arena;
3436
pub extern crate getopts;
3537
extern crate graphviz;

src/librustc_target/spec/mod.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -1272,7 +1272,8 @@ impl ToJson for Target {
12721272

12731273
fn maybe_jemalloc() -> Option<String> {
12741274
if cfg!(feature = "jemalloc") {
1275-
Some("alloc_jemalloc".to_string())
1275+
None
1276+
// Some("alloc_jemalloc".to_string())
12761277
} else {
12771278
None
12781279
}

0 commit comments

Comments
 (0)