Skip to content

Commit aea2c1d

Browse files
committed
Auto merge of #133792 - lqd:jemallocup, r=Mark-Simulacrum
switch `jemalloc-sys` back to `tikv-jemalloc-sys`, and update to 0.6.0 Some context: - we used to use jemalloc bindings from https://github.com/gnzlbg/jemallocator, since #55238 - that crate was abandoned, picked up as a fork in https://github.com/tikv/jemallocator, so we switched to that in #83152. - then they were able to publish to the original `jemalloc-sys` bindings crate, and `jemalloc-sys` and `tikv-jemalloc-sys` became the same thing -- so I switched back to the OG crate in #96790 - they're now having publishing problems again: I've been waiting for tikv/jemallocator#96 for the `jemalloc-sys` 0.6.0 update for a few months, but `tikv-jemalloc-sys` is already updated to 0.6.0. A perf run showed some improvements, so this PR switches back to `tikv-jemalloc-sys` to update to 0.6.0.
2 parents 0dc213c + 1291394 commit aea2c1d

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ directories = "5"
3131
# Copied from `compiler/rustc/Cargo.toml`.
3232
# But only for some targets, it fails for others. Rustc configures this in its CI, but we can't
3333
# easily use that since we support of-tree builds.
34-
[target.'cfg(any(target_os = "linux", target_os = "macos"))'.dependencies.jemalloc-sys]
35-
version = "0.5.0"
34+
[target.'cfg(any(target_os = "linux", target_os = "macos"))'.dependencies.tikv-jemalloc-sys]
35+
version = "0.6.0"
3636
features = ['unprefixed_malloc_on_supported_platforms']
3737

3838
[target.'cfg(unix)'.dependencies]

src/bin/miri.rs

+2
Original file line numberDiff line numberDiff line change
@@ -316,6 +316,8 @@ fn jemalloc_magic() {
316316
// See there for further comments.
317317
use std::os::raw::{c_int, c_void};
318318

319+
use tikv_jemalloc_sys as jemalloc_sys;
320+
319321
#[used]
320322
static _F1: unsafe extern "C" fn(usize, usize) -> *mut c_void = jemalloc_sys::calloc;
321323
#[used]

0 commit comments

Comments
 (0)