diff options
| author | Nicholas Nethercote <nnethercote@mozilla.com> | 2017-10-18 10:42:01 +1100 |
|---|---|---|
| committer | Nicholas Nethercote <nnethercote@mozilla.com> | 2017-10-18 22:20:37 +1100 |
| commit | 4506f0d30cbbb02df32e9c16135ef288ad6b7e2e (patch) | |
| tree | 9a3de6bfdfabc6dee92352fb18df31e2468acf07 /components/style/Cargo.toml | |
| parent | 421baa854ea40c7b1a3d1e75acac14da04a3fbcc (diff) | |
| download | servo-4506f0d30cbbb02df32e9c16135ef288ad6b7e2e.tar.gz servo-4506f0d30cbbb02df32e9c16135ef288ad6b7e2e.zip | |
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`.
Diffstat (limited to 'components/style/Cargo.toml')
| -rw-r--r-- | components/style/Cargo.toml | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/components/style/Cargo.toml b/components/style/Cargo.toml index 140c1b7d094..eb79cdbe40f 100644 --- a/components/style/Cargo.toml +++ b/components/style/Cargo.toml @@ -16,12 +16,11 @@ path = "lib.rs" doctest = false [features] -gecko = ["malloc_size_of", "malloc_size_of_derive", "nsstring_vendor", "num_cpus", +gecko = ["nsstring_vendor", "num_cpus", "style_traits/gecko", "fallible/known_system_malloc"] use_bindgen = ["bindgen", "regex", "toml"] -servo = ["serde", "heapsize", "heapsize_derive", - "style_traits/servo", "servo_atoms", "servo_config", "html5ever", - "cssparser/heapsize", "cssparser/serde", "encoding", "smallvec/heapsizeof", +servo = ["serde", "style_traits/servo", "servo_atoms", "servo_config", "html5ever", + "cssparser/serde", "encoding", "malloc_size_of/servo", # FIXME: Uncomment when https://github.com/servo/servo/pull/16953 has landed: #"arrayvec/use_union" @@ -42,16 +41,14 @@ euclid = "0.15" fallible = { path = "../fallible" } fnv = "1.0" hashglobe = { path = "../hashglobe" } -heapsize = {version = "0.4", optional = true} -heapsize_derive = {version = "0.1", optional = true} itertools = "0.5" itoa = "0.3" html5ever = {version = "0.20", optional = true} lazy_static = "0.2" lru_cache = { path = "../lru_cache" } log = "0.3" -malloc_size_of = { path = "../malloc_size_of", optional=true } -malloc_size_of_derive = { path = "../malloc_size_of_derive", optional=true } +malloc_size_of = { path = "../malloc_size_of" } +malloc_size_of_derive = { path = "../malloc_size_of_derive" } matches = "0.1" nsstring_vendor = {path = "gecko_bindings/nsstring_vendor", optional = true} num_cpus = {version = "1.1.0", optional = true} |