diff --git a/servo/components/script/dom/bindings/codegen/CodegenRust.py b/servo/components/script/dom/bindings/codegen/CodegenRust.py index 9c5592c67b2b..3378700ca991 100644 --- a/servo/components/script/dom/bindings/codegen/CodegenRust.py +++ b/servo/components/script/dom/bindings/codegen/CodegenRust.py @@ -1748,12 +1748,14 @@ def DOMClass(descriptor): # padding. protoList.extend(['PrototypeList::ID::Count'] * (descriptor.config.maxProtoChainLength - len(protoList))) prototypeChainString = ', '.join(protoList) + heapSizeOf = 'heap_size_of_raw_self_and_children::<%s>' % descriptor.interface.identifier.name return """\ DOMClass { interface_chain: [ %s ], native_hooks: &sNativePropertyHooks, type_id: %s, -}""" % (prototypeChainString, DOMClassTypeId(descriptor)) + heap_size_of: %s as unsafe fn(_) -> _, +}""" % (prototypeChainString, DOMClassTypeId(descriptor), heapSizeOf) class CGDOMJSClass(CGThing): @@ -5141,6 +5143,7 @@ class CGBindingRoot(CGThing): 'dom::bindings::num::Finite', 'dom::bindings::str::ByteString', 'dom::bindings::str::USVString', + 'mem::heap_size_of_raw_self_and_children', 'libc', 'util::str::DOMString', 'std::borrow::ToOwned', diff --git a/servo/components/script/dom/bindings/utils.rs b/servo/components/script/dom/bindings/utils.rs index 7a76e51ba2a6..7b430f1340ee 100644 --- a/servo/components/script/dom/bindings/utils.rs +++ b/servo/components/script/dom/bindings/utils.rs @@ -150,6 +150,7 @@ pub struct NativePropertyHooks { } /// The struct that holds inheritance information for DOM object reflectors. +#[allow(raw_pointer_derive)] #[derive(Copy, Clone)] pub struct DOMClass { /// A list of interfaces that this object implements, in order of decreasing @@ -161,6 +162,9 @@ pub struct DOMClass { /// The NativePropertyHooks for the interface associated with this class. pub native_hooks: &'static NativePropertyHooks, + + /// The HeapSizeOf function wrapper for that interface. + pub heap_size_of: unsafe fn(*const libc::c_void) -> usize, } unsafe impl Sync for DOMClass {} diff --git a/servo/components/script/mem.rs b/servo/components/script/mem.rs index 039b33f24a92..aae70c5ef450 100644 --- a/servo/components/script/mem.rs +++ b/servo/components/script/mem.rs @@ -4,241 +4,26 @@ //! Routines for handling measuring the memory usage of arbitrary DOM nodes. -use dom::bindings::codegen::InheritTypes::*; -use dom::eventtarget::EventTarget; -use libc; +use dom::bindings::conversions::get_dom_class; +use dom::bindings::utils::Reflectable; +use libc::c_void; use util::mem::{HeapSizeOf, heap_size_of}; // This is equivalent to measuring a Box, except that DOM objects lose their // associated box in order to stash their pointers in a reserved slot of their -// JS reflector. It is assumed that the caller passes a pointer to the most-derived -// type that this pointer represents, or the actual heap usage of the pointee will -// be under-reported. -fn heap_size_of_self_and_children(obj: &T) -> usize { - heap_size_of(obj as *const T as *const libc::c_void) + obj.heap_size_of_children() -} - -pub fn heap_size_of_eventtarget(target: &EventTarget) -> usize { - //TODO: add more specific matches for concrete element types as derive(HeapSizeOf) is - // added to each one. - match *target.type_id() { - EventTargetTypeId::Window => - heap_size_of_self_and_children(WindowCast::to_ref(target).unwrap()), - EventTargetTypeId::Node(NodeTypeId::CharacterData(_)) => - heap_size_of_self_and_children(CharacterDataCast::to_ref(target).unwrap()), - EventTargetTypeId::Node(NodeTypeId::Document) => - heap_size_of_self_and_children(DocumentCast::to_ref(target).unwrap()), - EventTargetTypeId::Node(NodeTypeId::Element(ElementTypeId::Element)) => - heap_size_of_self_and_children(ElementCast::to_ref(target).unwrap()), - EventTargetTypeId::Node(NodeTypeId::Element( - ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLElement))) => - heap_size_of_self_and_children(HTMLElementCast::to_ref(target).unwrap()), - EventTargetTypeId::Node(NodeTypeId::Element( - ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLAnchorElement))) => - heap_size_of_self_and_children(HTMLAnchorElementCast::to_ref(target).unwrap()), - EventTargetTypeId::Node(NodeTypeId::Element( - ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLAppletElement))) => - heap_size_of_self_and_children(HTMLAppletElementCast::to_ref(target).unwrap()), - EventTargetTypeId::Node(NodeTypeId::Element( - ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLAreaElement))) => - heap_size_of_self_and_children(HTMLAreaElementCast::to_ref(target).unwrap()), - EventTargetTypeId::Node(NodeTypeId::Element( - ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLBaseElement))) => - heap_size_of_self_and_children(HTMLBaseElementCast::to_ref(target).unwrap()), - EventTargetTypeId::Node(NodeTypeId::Element( - ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLBRElement))) => - heap_size_of_self_and_children(HTMLBRElementCast::to_ref(target).unwrap()), - EventTargetTypeId::Node(NodeTypeId::Element( - ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLBodyElement))) => - heap_size_of_self_and_children(HTMLBodyElementCast::to_ref(target).unwrap()), - EventTargetTypeId::Node(NodeTypeId::Element( - ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLButtonElement))) => - heap_size_of_self_and_children(HTMLButtonElementCast::to_ref(target).unwrap()), - EventTargetTypeId::Node(NodeTypeId::Element( - ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLCanvasElement))) => - heap_size_of_self_and_children(HTMLCanvasElementCast::to_ref(target).unwrap()), - EventTargetTypeId::Node(NodeTypeId::Element( - ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLDataElement))) => - heap_size_of_self_and_children(HTMLDataElementCast::to_ref(target).unwrap()), - EventTargetTypeId::Node(NodeTypeId::Element( - ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLDataListElement))) => - heap_size_of_self_and_children(HTMLDataListElementCast::to_ref(target).unwrap()), - EventTargetTypeId::Node(NodeTypeId::Element( - ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLDialogElement))) => - heap_size_of_self_and_children(HTMLDialogElementCast::to_ref(target).unwrap()), - EventTargetTypeId::Node(NodeTypeId::Element( - ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLDirectoryElement))) => - heap_size_of_self_and_children(HTMLDirectoryElementCast::to_ref(target).unwrap()), - EventTargetTypeId::Node(NodeTypeId::Element( - ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLDListElement))) => - heap_size_of_self_and_children(HTMLDListElementCast::to_ref(target).unwrap()), - EventTargetTypeId::Node(NodeTypeId::Element( - ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLDivElement))) => - heap_size_of_self_and_children(HTMLDivElementCast::to_ref(target).unwrap()), - EventTargetTypeId::Node(NodeTypeId::Element( - ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLEmbedElement))) => - heap_size_of_self_and_children(HTMLEmbedElementCast::to_ref(target).unwrap()), - EventTargetTypeId::Node(NodeTypeId::Element( - ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLFieldSetElement))) => - heap_size_of_self_and_children(HTMLFieldSetElementCast::to_ref(target).unwrap()), - EventTargetTypeId::Node(NodeTypeId::Element( - ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLFontElement))) => - heap_size_of_self_and_children(HTMLFontElementCast::to_ref(target).unwrap()), - EventTargetTypeId::Node(NodeTypeId::Element( - ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLFormElement))) => - heap_size_of_self_and_children(HTMLFormElementCast::to_ref(target).unwrap()), - EventTargetTypeId::Node(NodeTypeId::Element( - ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLFrameElement))) => - heap_size_of_self_and_children(HTMLFrameElementCast::to_ref(target).unwrap()), - EventTargetTypeId::Node(NodeTypeId::Element( - ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLFrameSetElement))) => - heap_size_of_self_and_children(HTMLFrameSetElementCast::to_ref(target).unwrap()), - EventTargetTypeId::Node(NodeTypeId::Element( - ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLHRElement))) => - heap_size_of_self_and_children(HTMLHRElementCast::to_ref(target).unwrap()), - EventTargetTypeId::Node(NodeTypeId::Element( - ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLHeadElement))) => - heap_size_of_self_and_children(HTMLHeadElementCast::to_ref(target).unwrap()), - EventTargetTypeId::Node(NodeTypeId::Element( - ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLHeadingElement))) => - heap_size_of_self_and_children(HTMLHeadingElementCast::to_ref(target).unwrap()), - EventTargetTypeId::Node(NodeTypeId::Element( - ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLHtmlElement))) => - heap_size_of_self_and_children(HTMLHtmlElementCast::to_ref(target).unwrap()), - EventTargetTypeId::Node(NodeTypeId::Element( - ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLIFrameElement))) => - heap_size_of_self_and_children(HTMLIFrameElementCast::to_ref(target).unwrap()), - EventTargetTypeId::Node(NodeTypeId::Element( - ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLImageElement))) => - heap_size_of_self_and_children(HTMLImageElementCast::to_ref(target).unwrap()), - EventTargetTypeId::Node(NodeTypeId::Element( - ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLInputElement))) => - heap_size_of_self_and_children(HTMLInputElementCast::to_ref(target).unwrap()), - EventTargetTypeId::Node(NodeTypeId::Element( - ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLLabelElement))) => - heap_size_of_self_and_children(HTMLLabelElementCast::to_ref(target).unwrap()), - EventTargetTypeId::Node(NodeTypeId::Element( - ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLLegendElement))) => - heap_size_of_self_and_children(HTMLLegendElementCast::to_ref(target).unwrap()), - EventTargetTypeId::Node(NodeTypeId::Element( - ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLLinkElement))) => - heap_size_of_self_and_children(HTMLLinkElementCast::to_ref(target).unwrap()), - EventTargetTypeId::Node(NodeTypeId::Element( - ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLLIElement))) => - heap_size_of_self_and_children(HTMLLIElementCast::to_ref(target).unwrap()), - EventTargetTypeId::Node(NodeTypeId::Element( - ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLMapElement))) => - heap_size_of_self_and_children(HTMLMapElementCast::to_ref(target).unwrap()), - EventTargetTypeId::Node(NodeTypeId::Element(ElementTypeId::HTMLElement( - HTMLElementTypeId::HTMLMediaElement(HTMLMediaElementTypeId::HTMLAudioElement)))) => - heap_size_of_self_and_children(HTMLAudioElementCast::to_ref(target).unwrap()), - EventTargetTypeId::Node(NodeTypeId::Element(ElementTypeId::HTMLElement( - HTMLElementTypeId::HTMLMediaElement(HTMLMediaElementTypeId::HTMLVideoElement)))) => - heap_size_of_self_and_children(HTMLVideoElementCast::to_ref(target).unwrap()), - EventTargetTypeId::Node(NodeTypeId::Element( - ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLMetaElement))) => - heap_size_of_self_and_children(HTMLMetaElementCast::to_ref(target).unwrap()), - EventTargetTypeId::Node(NodeTypeId::Element( - ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLMeterElement))) => - heap_size_of_self_and_children(HTMLMeterElementCast::to_ref(target).unwrap()), - EventTargetTypeId::Node(NodeTypeId::Element( - ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLModElement))) => - heap_size_of_self_and_children(HTMLModElementCast::to_ref(target).unwrap()), - EventTargetTypeId::Node(NodeTypeId::Element( - ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLObjectElement))) => - heap_size_of_self_and_children(HTMLObjectElementCast::to_ref(target).unwrap()), - EventTargetTypeId::Node(NodeTypeId::Element( - ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLOListElement))) => - heap_size_of_self_and_children(HTMLOListElementCast::to_ref(target).unwrap()), - EventTargetTypeId::Node(NodeTypeId::Element( - ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLOptGroupElement))) => - heap_size_of_self_and_children(HTMLOptGroupElementCast::to_ref(target).unwrap()), - EventTargetTypeId::Node(NodeTypeId::Element( - ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLOptionElement))) => - heap_size_of_self_and_children(HTMLOptionElementCast::to_ref(target).unwrap()), - EventTargetTypeId::Node(NodeTypeId::Element( - ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLOutputElement))) => - heap_size_of_self_and_children(HTMLOutputElementCast::to_ref(target).unwrap()), - EventTargetTypeId::Node(NodeTypeId::Element( - ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLParagraphElement))) => - heap_size_of_self_and_children(HTMLParagraphElementCast::to_ref(target).unwrap()), - EventTargetTypeId::Node(NodeTypeId::Element( - ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLParamElement))) => - heap_size_of_self_and_children(HTMLParamElementCast::to_ref(target).unwrap()), - EventTargetTypeId::Node(NodeTypeId::Element( - ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLPreElement))) => - heap_size_of_self_and_children(HTMLPreElementCast::to_ref(target).unwrap()), - EventTargetTypeId::Node(NodeTypeId::Element( - ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLProgressElement))) => - heap_size_of_self_and_children(HTMLProgressElementCast::to_ref(target).unwrap()), - EventTargetTypeId::Node(NodeTypeId::Element( - ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLQuoteElement))) => - heap_size_of_self_and_children(HTMLQuoteElementCast::to_ref(target).unwrap()), - EventTargetTypeId::Node(NodeTypeId::Element( - ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLScriptElement))) => - heap_size_of_self_and_children(HTMLScriptElementCast::to_ref(target).unwrap()), - EventTargetTypeId::Node(NodeTypeId::Element( - ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLSelectElement))) => - heap_size_of_self_and_children(HTMLSelectElementCast::to_ref(target).unwrap()), - EventTargetTypeId::Node(NodeTypeId::Element( - ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLSourceElement))) => - heap_size_of_self_and_children(HTMLSourceElementCast::to_ref(target).unwrap()), - EventTargetTypeId::Node(NodeTypeId::Element( - ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLSpanElement))) => - heap_size_of_self_and_children(HTMLSpanElementCast::to_ref(target).unwrap()), - EventTargetTypeId::Node(NodeTypeId::Element( - ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLStyleElement))) => - heap_size_of_self_and_children(HTMLStyleElementCast::to_ref(target).unwrap()), - EventTargetTypeId::Node(NodeTypeId::Element( - ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLTableElement))) => - heap_size_of_self_and_children(HTMLTableElementCast::to_ref(target).unwrap()), - EventTargetTypeId::Node(NodeTypeId::Element( - ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLTableCaptionElement))) => - heap_size_of_self_and_children(HTMLTableCaptionElementCast::to_ref(target).unwrap()), - EventTargetTypeId::Node(NodeTypeId::Element(ElementTypeId::HTMLElement( - HTMLElementTypeId::HTMLTableCellElement(HTMLTableCellElementTypeId::HTMLTableDataCellElement)))) => - heap_size_of_self_and_children(HTMLTableDataCellElementCast::to_ref(target).unwrap()), - EventTargetTypeId::Node(NodeTypeId::Element(ElementTypeId::HTMLElement( - HTMLElementTypeId::HTMLTableCellElement(HTMLTableCellElementTypeId::HTMLTableHeaderCellElement)))) => - heap_size_of_self_and_children(HTMLTableHeaderCellElementCast::to_ref(target).unwrap()), - EventTargetTypeId::Node(NodeTypeId::Element( - ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLTableColElement))) => - heap_size_of_self_and_children(HTMLTableColElementCast::to_ref(target).unwrap()), - EventTargetTypeId::Node(NodeTypeId::Element( - ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLTableRowElement))) => - heap_size_of_self_and_children(HTMLTableRowElementCast::to_ref(target).unwrap()), - EventTargetTypeId::Node(NodeTypeId::Element( - ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLTableSectionElement))) => - heap_size_of_self_and_children(HTMLTableSectionElementCast::to_ref(target).unwrap()), - EventTargetTypeId::Node(NodeTypeId::Element( - ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLTemplateElement))) => - heap_size_of_self_and_children(HTMLTemplateElementCast::to_ref(target).unwrap()), - EventTargetTypeId::Node(NodeTypeId::Element( - ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLTextAreaElement))) => - heap_size_of_self_and_children(HTMLTextAreaElementCast::to_ref(target).unwrap()), - EventTargetTypeId::Node(NodeTypeId::Element( - ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLTimeElement))) => - heap_size_of_self_and_children(HTMLTimeElementCast::to_ref(target).unwrap()), - EventTargetTypeId::Node(NodeTypeId::Element( - ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLTitleElement))) => - heap_size_of_self_and_children(HTMLTitleElementCast::to_ref(target).unwrap()), - EventTargetTypeId::Node(NodeTypeId::Element( - ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLTrackElement))) => - heap_size_of_self_and_children(HTMLTrackElementCast::to_ref(target).unwrap()), - EventTargetTypeId::Node(NodeTypeId::Element( - ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLUListElement))) => - heap_size_of_self_and_children(HTMLUListElementCast::to_ref(target).unwrap()), - EventTargetTypeId::Node(NodeTypeId::Element( - ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLUnknownElement))) => - heap_size_of_self_and_children(HTMLUnknownElementCast::to_ref(target).unwrap()), - EventTargetTypeId::WebSocket => 0, - EventTargetTypeId::Worker => 0, - EventTargetTypeId::FileReader => 0, - EventTargetTypeId::WorkerGlobalScope(_) => 0, - EventTargetTypeId::XMLHttpRequestEventTarget(_) => 0, - EventTargetTypeId::Node(NodeTypeId::DocumentType) => - heap_size_of_self_and_children(DocumentTypeCast::to_ref(target).unwrap()), - EventTargetTypeId::Node(NodeTypeId::DocumentFragment) => - heap_size_of_self_and_children(DocumentFragmentCast::to_ref(target).unwrap()), +// JS reflector. +#[allow(unsafe_code)] +pub fn heap_size_of_self_and_children(obj: &T) -> usize { + unsafe { + let class = get_dom_class(obj.reflector().get_jsobject().get()).unwrap(); + (class.heap_size_of)(obj as *const T as *const c_void) } } + +/// Used by codegen to include the pointer to the `HeapSizeOf` 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 heap_size_of_raw_self_and_children(obj: *const c_void) -> usize { + heap_size_of(obj) + (*(obj as *const T)).heap_size_of_children() +} diff --git a/servo/components/script/script_task.rs b/servo/components/script/script_task.rs index 4c72ab33463e..b25d1bc5b619 100644 --- a/servo/components/script/script_task.rs +++ b/servo/components/script/script_task.rs @@ -61,7 +61,7 @@ use js::rust::Runtime; use layout_interface::{ReflowQueryType}; use layout_interface::{self, LayoutChan, NewLayoutTaskInfo, ReflowGoal, ScriptLayoutChan}; use libc; -use mem::heap_size_of_eventtarget; +use mem::heap_size_of_self_and_children; use msg::compositor_msg::{LayerId, ScriptToCompositorMsg}; use msg::constellation_msg::Msg as ConstellationMsg; use msg::constellation_msg::{ConstellationChan, FocusType, LoadData}; @@ -1258,11 +1258,11 @@ impl ScriptTask { for child in NodeCast::from_ref(&*it_page.document()).traverse_preorder() { let target = EventTargetCast::from_ref(&*child); - dom_tree_size += heap_size_of_eventtarget(target); + dom_tree_size += heap_size_of_self_and_children(target); } let window = it_page.window(); let target = EventTargetCast::from_ref(&*window); - dom_tree_size += heap_size_of_eventtarget(target); + dom_tree_size += heap_size_of_self_and_children(target); reports.push(Report { path: path![format!("url({})", current_url), "dom-tree"],