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
|
@ -38,25 +38,25 @@ use style::context::QuirksMode as ServoQuirksMode;
|
|||
|
||||
type ParseNodeId = usize;
|
||||
|
||||
#[derive(Clone, HeapSizeOf, JSTraceable)]
|
||||
#[derive(Clone, JSTraceable, MallocSizeOf)]
|
||||
pub struct ParseNode {
|
||||
id: ParseNodeId,
|
||||
qual_name: Option<QualName>,
|
||||
}
|
||||
|
||||
#[derive(HeapSizeOf, JSTraceable)]
|
||||
#[derive(JSTraceable, MallocSizeOf)]
|
||||
enum NodeOrText {
|
||||
Node(ParseNode),
|
||||
Text(String),
|
||||
}
|
||||
|
||||
#[derive(HeapSizeOf, JSTraceable)]
|
||||
#[derive(JSTraceable, MallocSizeOf)]
|
||||
struct Attribute {
|
||||
name: QualName,
|
||||
value: String,
|
||||
}
|
||||
|
||||
#[derive(HeapSizeOf, JSTraceable)]
|
||||
#[derive(JSTraceable, MallocSizeOf)]
|
||||
enum ParseOperation {
|
||||
GetTemplateContents { target: ParseNodeId, contents: ParseNodeId },
|
||||
|
||||
|
@ -99,21 +99,21 @@ enum ParseOperation {
|
|||
Pop { node: ParseNodeId },
|
||||
|
||||
SetQuirksMode {
|
||||
#[ignore_heap_size_of = "Defined in style"]
|
||||
#[ignore_malloc_size_of = "Defined in style"]
|
||||
mode: ServoQuirksMode
|
||||
},
|
||||
}
|
||||
|
||||
#[derive(HeapSizeOf)]
|
||||
#[derive(MallocSizeOf)]
|
||||
enum ToTokenizerMsg {
|
||||
// From HtmlTokenizer
|
||||
TokenizerResultDone {
|
||||
#[ignore_heap_size_of = "Defined in html5ever"]
|
||||
#[ignore_malloc_size_of = "Defined in html5ever"]
|
||||
updated_input: VecDeque<SendTendril<UTF8>>
|
||||
},
|
||||
TokenizerResultScript {
|
||||
script: ParseNode,
|
||||
#[ignore_heap_size_of = "Defined in html5ever"]
|
||||
#[ignore_malloc_size_of = "Defined in html5ever"]
|
||||
updated_input: VecDeque<SendTendril<UTF8>>
|
||||
},
|
||||
End, // Sent to Tokenizer to signify HtmlTokenizer's end method has returned
|
||||
|
@ -122,10 +122,10 @@ enum ToTokenizerMsg {
|
|||
ProcessOperation(ParseOperation),
|
||||
}
|
||||
|
||||
#[derive(HeapSizeOf)]
|
||||
#[derive(MallocSizeOf)]
|
||||
enum ToHtmlTokenizerMsg {
|
||||
Feed {
|
||||
#[ignore_heap_size_of = "Defined in html5ever"]
|
||||
#[ignore_malloc_size_of = "Defined in html5ever"]
|
||||
input: VecDeque<SendTendril<UTF8>>
|
||||
},
|
||||
End,
|
||||
|
@ -165,15 +165,15 @@ fn create_buffer_queue(mut buffers: VecDeque<SendTendril<UTF8>>) -> BufferQueue
|
|||
// | | | |________| |
|
||||
// |_____________| |_______________|
|
||||
//
|
||||
#[derive(HeapSizeOf, JSTraceable)]
|
||||
#[derive(JSTraceable, MallocSizeOf)]
|
||||
#[must_root]
|
||||
pub struct Tokenizer {
|
||||
document: Dom<Document>,
|
||||
#[ignore_heap_size_of = "Defined in std"]
|
||||
#[ignore_malloc_size_of = "Defined in std"]
|
||||
receiver: Receiver<ToTokenizerMsg>,
|
||||
#[ignore_heap_size_of = "Defined in std"]
|
||||
#[ignore_malloc_size_of = "Defined in std"]
|
||||
html_tokenizer_sender: Sender<ToHtmlTokenizerMsg>,
|
||||
#[ignore_heap_size_of = "Defined in std"]
|
||||
#[ignore_malloc_size_of = "Defined in std"]
|
||||
nodes: HashMap<ParseNodeId, Dom<Node>>,
|
||||
url: ServoUrl,
|
||||
}
|
||||
|
@ -495,7 +495,7 @@ fn run(sink: Sink,
|
|||
}
|
||||
}
|
||||
|
||||
#[derive(Default, HeapSizeOf, JSTraceable)]
|
||||
#[derive(Default, JSTraceable, MallocSizeOf)]
|
||||
struct ParseNodeData {
|
||||
contents: Option<ParseNode>,
|
||||
is_integration_point: bool,
|
||||
|
|
|
@ -28,10 +28,10 @@ use js::jsapi::JSTracer;
|
|||
use servo_url::ServoUrl;
|
||||
use std::io;
|
||||
|
||||
#[derive(HeapSizeOf, JSTraceable)]
|
||||
#[derive(JSTraceable, MallocSizeOf)]
|
||||
#[must_root]
|
||||
pub struct Tokenizer {
|
||||
#[ignore_heap_size_of = "Defined in html5ever"]
|
||||
#[ignore_malloc_size_of = "Defined in html5ever"]
|
||||
inner: HtmlTokenizer<TreeBuilder<Dom<Node>, Sink>>,
|
||||
}
|
||||
|
||||
|
|
|
@ -74,13 +74,13 @@ pub struct ServoParser {
|
|||
/// The document associated with this parser.
|
||||
document: Dom<Document>,
|
||||
/// Input received from network.
|
||||
#[ignore_heap_size_of = "Defined in html5ever"]
|
||||
#[ignore_malloc_size_of = "Defined in html5ever"]
|
||||
network_input: DomRefCell<BufferQueue>,
|
||||
/// Part of an UTF-8 code point spanning input chunks
|
||||
#[ignore_heap_size_of = "Defined in html5ever"]
|
||||
#[ignore_malloc_size_of = "Defined in html5ever"]
|
||||
incomplete_utf8: DomRefCell<Option<IncompleteUtf8>>,
|
||||
/// Input received from script. Used only to support document.write().
|
||||
#[ignore_heap_size_of = "Defined in html5ever"]
|
||||
#[ignore_malloc_size_of = "Defined in html5ever"]
|
||||
script_input: DomRefCell<BufferQueue>,
|
||||
/// The tokenizer of this parser.
|
||||
tokenizer: DomRefCell<Tokenizer>,
|
||||
|
@ -493,13 +493,13 @@ impl<I> Iterator for FragmentParsingResult<I>
|
|||
}
|
||||
}
|
||||
|
||||
#[derive(HeapSizeOf, JSTraceable, PartialEq)]
|
||||
#[derive(JSTraceable, MallocSizeOf, PartialEq)]
|
||||
enum ParserKind {
|
||||
Normal,
|
||||
ScriptCreated,
|
||||
}
|
||||
|
||||
#[derive(HeapSizeOf, JSTraceable)]
|
||||
#[derive(JSTraceable, MallocSizeOf)]
|
||||
#[must_root]
|
||||
enum Tokenizer {
|
||||
Html(self::html::Tokenizer),
|
||||
|
@ -742,7 +742,7 @@ fn insert(parent: &Node, reference_child: Option<&Node>, child: NodeOrText<Dom<N
|
|||
}
|
||||
}
|
||||
|
||||
#[derive(HeapSizeOf, JSTraceable)]
|
||||
#[derive(JSTraceable, MallocSizeOf)]
|
||||
#[must_root]
|
||||
pub struct Sink {
|
||||
base_url: ServoUrl,
|
||||
|
|
|
@ -16,10 +16,10 @@ use xml5ever::buffer_queue::BufferQueue;
|
|||
use xml5ever::tokenizer::XmlTokenizer;
|
||||
use xml5ever::tree_builder::{Tracer as XmlTracer, XmlTreeBuilder};
|
||||
|
||||
#[derive(HeapSizeOf, JSTraceable)]
|
||||
#[derive(JSTraceable, MallocSizeOf)]
|
||||
#[must_root]
|
||||
pub struct Tokenizer {
|
||||
#[ignore_heap_size_of = "Defined in xml5ever"]
|
||||
#[ignore_malloc_size_of = "Defined in xml5ever"]
|
||||
inner: XmlTokenizer<XmlTreeBuilder<Dom<Node>, Sink>>,
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue