mirror of
https://github.com/servo/servo.git
synced 2025-08-03 04:30:10 +01:00
Replace all uses of the heapsize
crate with malloc_size_of
.
Servo currently uses `heapsize`, but Stylo/Gecko use `malloc_size_of`. `malloc_size_of` is better -- it handles various cases that `heapsize` does not -- so this patch changes Servo to use `malloc_size_of`. This patch makes the following changes to the `malloc_size_of` crate. - Adds `MallocSizeOf` trait implementations for numerous types, some built-in (e.g. `VecDeque`), some external and Servo-only (e.g. `string_cache`). - Makes `enclosing_size_of_op` optional, because vanilla jemalloc doesn't support that operation. - For `HashSet`/`HashMap`, falls back to a computed estimate when `enclosing_size_of_op` isn't available. - Adds an extern "C" `malloc_size_of` function that does the actual heap measurement; this is based on the same functions from the `heapsize` crate. This patch makes the following changes elsewhere. - Converts all the uses of `heapsize` to instead use `malloc_size_of`. - Disables the "heapsize"/"heap_size" feature for the external crates that provide it. - Removes the `HeapSizeOf` implementation from `hashglobe`. - Adds `ignore` annotations to a few `Rc`/`Arc`, because `malloc_size_of` doesn't derive those types, unlike `heapsize`.
This commit is contained in:
parent
421baa854e
commit
4506f0d30c
269 changed files with 1418 additions and 1521 deletions
|
@ -77,15 +77,15 @@ pub struct HTMLMediaElement {
|
|||
/// <https://html.spec.whatwg.org/multipage/#delaying-the-load-event-flag>
|
||||
delaying_the_load_event_flag: DomRefCell<Option<LoadBlocker>>,
|
||||
/// <https://html.spec.whatwg.org/multipage/#list-of-pending-play-promises>
|
||||
#[ignore_heap_size_of = "promises are hard"]
|
||||
#[ignore_malloc_size_of = "promises are hard"]
|
||||
pending_play_promises: DomRefCell<Vec<Rc<Promise>>>,
|
||||
/// Play promises which are soon to be fulfilled by a queued task.
|
||||
#[ignore_heap_size_of = "promises are hard"]
|
||||
#[ignore_malloc_size_of = "promises are hard"]
|
||||
in_flight_play_promises_queue: DomRefCell<VecDeque<(Box<[Rc<Promise>]>, ErrorResult)>>,
|
||||
}
|
||||
|
||||
/// <https://html.spec.whatwg.org/multipage/#dom-media-networkstate>
|
||||
#[derive(Clone, Copy, HeapSizeOf, JSTraceable, PartialEq)]
|
||||
#[derive(Clone, Copy, JSTraceable, MallocSizeOf, PartialEq)]
|
||||
#[repr(u8)]
|
||||
pub enum NetworkState {
|
||||
Empty = HTMLMediaElementConstants::NETWORK_EMPTY as u8,
|
||||
|
@ -95,7 +95,7 @@ pub enum NetworkState {
|
|||
}
|
||||
|
||||
/// <https://html.spec.whatwg.org/multipage/#dom-media-readystate>
|
||||
#[derive(Clone, Copy, HeapSizeOf, JSTraceable, PartialEq, PartialOrd)]
|
||||
#[derive(Clone, Copy, JSTraceable, MallocSizeOf, PartialEq, PartialOrd)]
|
||||
#[repr(u8)]
|
||||
enum ReadyState {
|
||||
HaveNothing = HTMLMediaElementConstants::HAVE_NOTHING as u8,
|
||||
|
@ -940,7 +940,7 @@ impl VirtualMethods for HTMLMediaElement {
|
|||
}
|
||||
}
|
||||
|
||||
#[derive(HeapSizeOf, JSTraceable)]
|
||||
#[derive(JSTraceable, MallocSizeOf)]
|
||||
pub enum MediaElementMicrotask {
|
||||
ResourceSelectionTask {
|
||||
elem: DomRoot<HTMLMediaElement>,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue