mirror of
https://github.com/servo/servo.git
synced 2025-07-25 08:10:21 +01:00
script: Measure stored layout data memory usage. (#36664)
We previously ignored the opaque layout data field inside each node when measuring a DOM node's memory usage. While some of the reachable memory was accounted for by measuring the layout's box tree, measuring it via the node ensures that we don't miss anything. Since there are often Arc values involved, this means that the layout-thread box tree measurements now look quite small, while reported JS heap usage has increased. Testing: Manually compared about:memory for servo.org. --------- Signed-off-by: Josh Matthews <josh@joshmatthews.net>
This commit is contained in:
parent
9dc56d420f
commit
878d595035
7 changed files with 34 additions and 14 deletions
|
@ -27,7 +27,7 @@ use fonts::{FontContext, SystemFontServiceProxy};
|
|||
use fxhash::FxHashMap;
|
||||
use ipc_channel::ipc::IpcSender;
|
||||
use libc::c_void;
|
||||
use malloc_size_of::MallocSizeOfOps;
|
||||
use malloc_size_of::{MallocSizeOf as MallocSizeOfTrait, MallocSizeOfOps};
|
||||
use malloc_size_of_derive::MallocSizeOf;
|
||||
use net_traits::image_cache::{ImageCache, PendingImageId};
|
||||
use pixels::Image;
|
||||
|
@ -51,7 +51,11 @@ use style::selector_parser::{PseudoElement, RestyleDamage, Snapshot};
|
|||
use style::stylesheets::Stylesheet;
|
||||
use webrender_api::ImageKey;
|
||||
|
||||
pub type GenericLayoutData = dyn Any + Send + Sync;
|
||||
pub trait GenericLayoutDataTrait: Any + MallocSizeOfTrait {
|
||||
fn as_any(&self) -> &dyn Any;
|
||||
}
|
||||
|
||||
pub type GenericLayoutData = dyn GenericLayoutDataTrait + Send + Sync;
|
||||
|
||||
#[derive(MallocSizeOf)]
|
||||
pub struct StyleData {
|
||||
|
@ -59,7 +63,6 @@ pub struct StyleData {
|
|||
/// style system is being used standalone, this is all that hangs
|
||||
/// off the node. This must be first to permit the various
|
||||
/// transmutations between ElementData and PersistentLayoutData.
|
||||
#[ignore_malloc_size_of = "This probably should not be ignored"]
|
||||
pub element_data: AtomicRefCell<ElementData>,
|
||||
|
||||
/// Information needed during parallel traversals.
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue