Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 20:50:07 +01:00
Code Issues Projects Releases Packages Wiki Activity

deps: switch to tikv-jemallocator crates in Cargo.toml (#32828)

Browse source 
`jemallocator` and `jemallocator-sys` crates are same as the `tikv-*`
versions and these aliases were maintained for historical reasons, based
on crates.io documentation. For newer projects, it is recommended to use
the `tikv-` versions of the crate. Even though Servo is not a new
project, it makes sense to switch to the newer version for the sake of
clarity.

Also, more importantly, `tikv-jemallocator` has new release (0.6.0)
which includes a fix for #32720. There doesn't seem to be a
corresponding version publised for the `jemallocator` crate.

Fixes #32720

Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com>
This commit is contained in:
Mukilan Thiyagarajan 2024-07-22 13:25:46 +05:30 • committed by GitHub
parent f6dc35f11d
commit a007baa4cf
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 32 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

4
components/allocator/Cargo.toml
View file

@ -13,8 +13,8 @@ path = "lib.rs"
use-system-allocator = ["libc"]
[target.'cfg(not(any(windows, target_env = "ohos")))'.dependencies]
jemallocator = { workspace = true }
jemalloc-sys = { workspace = true }
tikv-jemallocator = { workspace = true }
tikv-jemalloc-sys = { workspace = true }
libc = { workspace = true, optional = true }
[target.'cfg(windows)'.dependencies]

6
components/allocator/lib.rs
View file

@ -13,7 +13,7 @@ pub use crate::platform::*;
mod platform {
use std::os::raw::c_void;
pub use jemallocator::Jemalloc as Allocator;
pub use tikv_jemallocator::Jemalloc as Allocator;
/// Get the size of a heap block.
///
@ -21,12 +21,12 @@ mod platform {
///
/// Passing a non-heap allocated pointer to this function results in undefined behavior.
pub unsafe extern "C" fn usable_size(ptr: *const c_void) -> usize {
jemallocator::usable_size(ptr)
tikv_jemallocator::usable_size(ptr)
}
/// Memory allocation APIs compatible with libc
pub mod libc_compat {
pub use jemalloc_sys::{free, malloc, realloc};
pub use tikv_jemalloc_sys::{free, malloc, realloc};
}
}

2
components/profile/Cargo.toml
View file

@ -26,4 +26,4 @@ regex = { workspace = true }
[target.'cfg(not(target_os = "windows"))'.dependencies]
libc = { workspace = true }
[target.'cfg(not(any(target_os = "windows", target_env = "ohos")))'.dependencies]
jemalloc-sys = { workspace = true }
tikv-jemalloc-sys = { workspace = true }

2
components/profile/mem.rs
View file

@ -500,7 +500,7 @@ mod system_reporter {
}
#[cfg(not(any(target_os = "windows", target_env = "ohos")))]
use jemalloc_sys::mallctl;
use tikv_jemalloc_sys::mallctl;
#[cfg(not(any(target_os = "windows", target_env = "ohos")))]
fn jemalloc_stat(value_name: &str) -> Option<usize> {