From 4506f0d30cbbb02df32e9c16135ef288ad6b7e2e Mon Sep 17 00:00:00 2001 From: Nicholas Nethercote Date: Wed, 18 Oct 2017 10:42:01 +1100 Subject: 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`. --- components/script/dom/window.rs | 42 ++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) (limited to 'components/script/dom/window.rs') diff --git a/components/script/dom/window.rs b/components/script/dom/window.rs index 9d2137911d7..6a62e124b92 100644 --- a/components/script/dom/window.rs +++ b/components/script/dom/window.rs @@ -127,14 +127,14 @@ use webrender_api::{ClipId, DocumentId}; use webvr_traits::WebVRMsg; /// Current state of the window object -#[derive(Clone, Copy, Debug, HeapSizeOf, JSTraceable, PartialEq)] +#[derive(Clone, Copy, Debug, JSTraceable, MallocSizeOf, PartialEq)] enum WindowState { Alive, Zombie, // Pipeline is closed, but the window hasn't been GCed yet. } /// Extra information concerning the reason for reflowing. -#[derive(Debug, HeapSizeOf)] +#[derive(Debug, MallocSizeOf)] pub enum ReflowReason { CachedPageNeededReflow, RefreshTick, @@ -161,24 +161,24 @@ pub enum ReflowReason { #[dom_struct] pub struct Window { globalscope: GlobalScope, - #[ignore_heap_size_of = "trait objects are hard"] + #[ignore_malloc_size_of = "trait objects are hard"] script_chan: MainThreadScriptChan, - #[ignore_heap_size_of = "task sources are hard"] + #[ignore_malloc_size_of = "task sources are hard"] dom_manipulation_task_source: DOMManipulationTaskSource, - #[ignore_heap_size_of = "task sources are hard"] + #[ignore_malloc_size_of = "task sources are hard"] user_interaction_task_source: UserInteractionTaskSource, - #[ignore_heap_size_of = "task sources are hard"] + #[ignore_malloc_size_of = "task sources are hard"] networking_task_source: NetworkingTaskSource, - #[ignore_heap_size_of = "task sources are hard"] + #[ignore_malloc_size_of = "task sources are hard"] history_traversal_task_source: HistoryTraversalTaskSource, - #[ignore_heap_size_of = "task sources are hard"] + #[ignore_malloc_size_of = "task sources are hard"] file_reading_task_source: FileReadingTaskSource, - #[ignore_heap_size_of = "task sources are hard"] + #[ignore_malloc_size_of = "task sources are hard"] performance_timeline_task_source: PerformanceTimelineTaskSource, navigator: MutNullableDom, - #[ignore_heap_size_of = "Arc"] + #[ignore_malloc_size_of = "Arc"] image_cache: Arc, - #[ignore_heap_size_of = "channels are hard"] + #[ignore_malloc_size_of = "channels are hard"] image_cache_chan: Sender, window_proxy: MutNullableDom, document: MutNullableDom, @@ -196,7 +196,7 @@ pub struct Window { /// For sending timeline markers. Will be ignored if /// no devtools server devtools_markers: DomRefCell>, - #[ignore_heap_size_of = "channels are hard"] + #[ignore_malloc_size_of = "channels are hard"] devtools_marker_sender: DomRefCell>>>, /// Pending resize event, if any. @@ -209,22 +209,22 @@ pub struct Window { dom_static: GlobalStaticData, /// The JavaScript runtime. - #[ignore_heap_size_of = "Rc is hard"] + #[ignore_malloc_size_of = "Rc is hard"] js_runtime: DomRefCell>>, /// A handle for communicating messages to the layout thread. - #[ignore_heap_size_of = "channels are hard"] + #[ignore_malloc_size_of = "channels are hard"] layout_chan: Sender, /// A handle to perform RPC calls into the layout, quickly. - #[ignore_heap_size_of = "trait objects are hard"] + #[ignore_malloc_size_of = "trait objects are hard"] layout_rpc: Box, /// The current size of the window, in pixels. window_size: Cell>, /// A handle for communicating messages to the bluetooth thread. - #[ignore_heap_size_of = "channels are hard"] + #[ignore_malloc_size_of = "channels are hard"] bluetooth_thread: IpcSender, bluetooth_extra_permission_data: BluetoothExtraPermissionData, @@ -242,7 +242,7 @@ pub struct Window { pending_reflow_count: Cell, /// A channel for communicating results of async scripts back to the webdriver server - #[ignore_heap_size_of = "channels are hard"] + #[ignore_malloc_size_of = "channels are hard"] webdriver_script_chan: DomRefCell>>, /// The current state of the window object @@ -251,7 +251,7 @@ pub struct Window { current_viewport: Cell>, /// A flag to prevent async events from attempting to interact with this window. - #[ignore_heap_size_of = "defined in std"] + #[ignore_malloc_size_of = "defined in std"] ignore_further_async_events: DomRefCell>, error_reporter: CSSErrorReporter, @@ -265,11 +265,11 @@ pub struct Window { test_runner: MutNullableDom, /// A handle for communicating messages to the webvr thread, if available. - #[ignore_heap_size_of = "channels are hard"] + #[ignore_malloc_size_of = "channels are hard"] webgl_chan: WebGLChan, /// A handle for communicating messages to the webvr thread, if available. - #[ignore_heap_size_of = "channels are hard"] + #[ignore_malloc_size_of = "channels are hard"] webvr_chan: Option>, /// A map for storing the previous permission state read results. @@ -290,7 +290,7 @@ pub struct Window { /// paint_worklet: MutNullableDom, /// The Webrender Document id associated with this window. - #[ignore_heap_size_of = "defined in webrender_api"] + #[ignore_malloc_size_of = "defined in webrender_api"] webrender_document: DocumentId, } -- cgit v1.2.3