Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update mimalloc, enable for glibc Linux aarch64, explicitly disable for wasm and musl #8462

Merged
merged 2 commits into from
Jun 14, 2024
Merged

Update mimalloc, enable for glibc Linux aarch64, explicitly disable for wasm and musl #8462

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7005728
Update mimalloc, enable for glibc Linux aarch64, explicitly disable f…
bgw Jun 12, 2024
cf91231
Reduce duplicate code across implementations of TurboMalloc
bgw Jun 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions crates/turbo-tasks-malloc/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
[package]
name = "turbo-tasks-malloc"
version = "0.1.0"
description = "TBD"
description = "A wrapper around mimalloc or the system allocator that tracks allocations"
license = "MPL-2.0"
edition = "2021"
autobenches = false

[lib]
bench = false

[target.'cfg(not(target_os = "linux"))'.dependencies]
mimalloc = { version = "0.1.32", features = [], optional = true }
[target.'cfg(not(any(target_os = "linux", target_family = "wasm", target_env = "musl")))'.dependencies]
mimalloc = { version = "0.1.42", features = [], optional = true }

[target.'cfg(all(target_os = "linux", not(target_arch = "aarch64")))'.dependencies]
mimalloc = { version = "0.1.32", features = [
[target.'cfg(all(target_os = "linux", not(any(target_family = "wasm", target_env = "musl"))))'.dependencies]
mimalloc = { version = "0.1.42", features = [
"local_dynamic_tls",
], optional = true }

Expand Down
59 changes: 17 additions & 42 deletions crates/turbo-tasks-malloc/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,70 +67,45 @@ impl TurboMalloc {
}
}

#[cfg(all(
feature = "custom_allocator",
not(all(target_os = "linux", target_arch = "aarch64"))
))]
unsafe impl GlobalAlloc for TurboMalloc {
unsafe fn alloc(&self, layout: Layout) -> *mut u8 {
let ret = mimalloc::MiMalloc.alloc(layout);
if !ret.is_null() {
add(layout.size());
}
ret
}

unsafe fn dealloc(&self, ptr: *mut u8, layout: Layout) {
mimalloc::MiMalloc.dealloc(ptr, layout);
remove(layout.size());
}

unsafe fn alloc_zeroed(&self, layout: Layout) -> *mut u8 {
let ret = mimalloc::MiMalloc.alloc_zeroed(layout);
if !ret.is_null() {
add(layout.size());
}
ret
}

unsafe fn realloc(&self, ptr: *mut u8, layout: Layout, new_size: usize) -> *mut u8 {
let ret = mimalloc::MiMalloc.realloc(ptr, layout, new_size);
if !ret.is_null() {
let old_size = layout.size();
update(old_size, new_size);
}
ret
}
/// Get the allocator for this platform that we should wrap with TurboMalloc.
#[inline]
fn base_alloc() -> &'static impl GlobalAlloc {
#[cfg(all(
feature = "custom_allocator",
not(any(target_family = "wasm", target_env = "musl"))
))]
return &mimalloc::MiMalloc;
#[cfg(any(
not(feature = "custom_allocator"),
any(target_family = "wasm", target_env = "musl")
))]
return &std::alloc::System;
}

#[cfg(any(
not(feature = "custom_allocator"),
all(target_os = "linux", target_arch = "aarch64")
))]
unsafe impl GlobalAlloc for TurboMalloc {
unsafe fn alloc(&self, layout: Layout) -> *mut u8 {
let ret = std::alloc::System.alloc(layout);
let ret = base_alloc().alloc(layout);
if !ret.is_null() {
add(layout.size());
}
ret
}

unsafe fn dealloc(&self, ptr: *mut u8, layout: Layout) {
std::alloc::System.dealloc(ptr, layout);
base_alloc().dealloc(ptr, layout);
remove(layout.size());
}

unsafe fn alloc_zeroed(&self, layout: Layout) -> *mut u8 {
let ret = std::alloc::System.alloc_zeroed(layout);
let ret = base_alloc().alloc_zeroed(layout);
if !ret.is_null() {
add(layout.size());
}
ret
}

unsafe fn realloc(&self, ptr: *mut u8, layout: Layout, new_size: usize) -> *mut u8 {
let ret = std::alloc::System.realloc(ptr, layout, new_size);
let ret = base_alloc().realloc(ptr, layout, new_size);
if !ret.is_null() {
let old_size = layout.size();
update(old_size, new_size);
Expand Down
Loading