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/lib.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'components/script/lib.rs') diff --git a/components/script/lib.rs b/components/script/lib.rs index 5f33f1e1151..edf954d4c96 100644 --- a/components/script/lib.rs +++ b/components/script/lib.rs @@ -39,8 +39,6 @@ extern crate euclid; extern crate fnv; extern crate gleam; extern crate half; -#[macro_use] extern crate heapsize; -#[macro_use] extern crate heapsize_derive; #[macro_use] extern crate html5ever; #[macro_use] extern crate hyper; @@ -56,6 +54,8 @@ extern crate lazy_static; extern crate libc; #[macro_use] extern crate log; +#[macro_use] extern crate malloc_size_of; +#[macro_use] extern crate malloc_size_of_derive; extern crate metrics; #[macro_use] extern crate mime; -- cgit v1.2.3