mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-21 09:15:35 +00:00
5a62942911
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`. <!-- Please describe your changes on the following line: --> --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: --> - [X] `./mach build -d` does not report any errors - [X] `./mach test-tidy` does not report any errors - [ ] These changes fix https://bugzilla.mozilla.org/show_bug.cgi?id=1409255 <!-- Either: --> - [ ] There are tests for these changes OR - [ ] These changes do not require tests because testing is on the Gecko side. <!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.--> <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. --> Source-Repo: https://github.com/servo/servo Source-Revision: 4c538b642e4bdfbf42c522c5a59c258a6d14546e --HG-- extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear extra : subtree_revision : f9a6feed1088d0b0be2b55d7f0c2ec9c594ac33b
34 lines
1.3 KiB
Rust
34 lines
1.3 KiB
Rust
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
|
|
//! Routines for handling measuring the memory usage of arbitrary DOM nodes.
|
|
|
|
use dom::bindings::conversions::get_dom_class;
|
|
use dom::bindings::reflector::DomObject;
|
|
use malloc_size_of::{MallocSizeOf, MallocSizeOfOps};
|
|
use std::os::raw::c_void;
|
|
|
|
// This is equivalent to measuring a Box<T>, except that DOM objects lose their
|
|
// associated box in order to stash their pointers in a reserved slot of their
|
|
// JS reflector.
|
|
#[allow(unsafe_code)]
|
|
pub fn malloc_size_of_including_self<T: DomObject + MallocSizeOf>(
|
|
ops: &mut MallocSizeOfOps, obj: &T) -> usize
|
|
{
|
|
unsafe {
|
|
let class = get_dom_class(obj.reflector().get_jsobject().get()).unwrap();
|
|
(class.malloc_size_of)(ops, obj as *const T as *const c_void)
|
|
}
|
|
}
|
|
|
|
/// Used by codegen to include the pointer to the `MallocSizeOf` implementation of each
|
|
/// IDL interface. This way we don't have to find the most-derived interface of DOM
|
|
/// objects by hand in code.
|
|
#[allow(unsafe_code)]
|
|
pub unsafe fn malloc_size_of_including_raw_self<T: MallocSizeOf>(
|
|
ops: &mut MallocSizeOfOps, obj: *const c_void) -> usize
|
|
{
|
|
ops.malloc_size_of(obj) + (*(obj as *const T)).size_of(ops)
|
|
}
|