-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
servo: Merge #18944 - Stop relying on linking details of std’s defaul…
…t allocator (from servo:jemallocator2); r=nox We’ve been bitten before by symbol names changing: servo/heapsize#46, and upstream is planning to stop using jemalloc by default: rust-lang/rust#33082 (comment) So use the (relatively) new `#[global_allocator]` attribute to explicitly select the system allocator on Windows and jemalloc (now in an external crate) on other platforms. This choice matches current defaults. Source-Repo: https://github.com/servo/servo Source-Revision: 07e9794306d597afe5d90d192fd32a99572c3cc3 UltraBlame original commit: 921526150768f9a2e9ba1586a350583f9ad025c9
- Loading branch information
Showing
20 changed files
with
152 additions
and
62 deletions.
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
[package] | ||
name = "servo_allocator" | ||
version = "0.0.1" | ||
authors = ["The Servo Project Developers"] | ||
license = "MPL-2.0" | ||
publish = false | ||
|
||
[lib] | ||
path = "lib.rs" | ||
|
||
[features] | ||
unstable = ["kernel32-sys", "jemallocator"] | ||
|
||
[target.'cfg(not(windows))'.dependencies] | ||
jemallocator = { version = "0.1.3", optional = true } | ||
|
||
[target.'cfg(windows)'.dependencies] | ||
kernel32-sys = { version = "0.2.1", optional = true } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,62 @@ | ||
|
||
|
||
|
||
|
||
|
||
|
||
#![cfg_attr(all(feature = "unstable", windows), feature(alloc_system, allocator_api))] | ||
#![cfg_attr(feature = "unstable", feature(global_allocator))] | ||
|
||
#[cfg(feature = "unstable")] | ||
#[global_allocator] | ||
static ALLOC: platform::Allocator = platform::Allocator; | ||
|
||
pub use platform::usable_size; | ||
|
||
|
||
#[cfg(all(feature = "unstable", not(windows)))] | ||
mod platform { | ||
extern crate jemallocator; | ||
|
||
pub use self::jemallocator::Jemalloc as Allocator; | ||
use std::os::raw::c_void; | ||
|
||
|
||
pub unsafe extern "C" fn usable_size(ptr: *const c_void) -> usize { | ||
jemallocator::usable_size(ptr) | ||
} | ||
} | ||
|
||
#[cfg(all(feature = "unstable", windows))] | ||
mod platform { | ||
extern crate alloc_system; | ||
extern crate kernel32; | ||
|
||
pub use self::alloc_system::System as Allocator; | ||
use self::kernel32::{GetProcessHeap, HeapSize, HeapValidate}; | ||
use std::os::raw::c_void; | ||
|
||
|
||
pub unsafe extern "C" fn usable_size(mut ptr: *const c_void) -> usize { | ||
let heap = GetProcessHeap(); | ||
|
||
if HeapValidate(heap, 0, ptr) == 0 { | ||
ptr = *(ptr as *const *const c_void).offset(-1); | ||
} | ||
|
||
HeapSize(heap, 0, ptr) as usize | ||
} | ||
} | ||
|
||
#[cfg(not(feature = "unstable"))] | ||
mod platform { | ||
use std::os::raw::c_void; | ||
|
||
|
||
|
||
pub unsafe extern "C" fn usable_size(_ptr: *const c_void) -> usize { | ||
0 | ||
} | ||
} | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.