45f978e547
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`. <!-- Please describe your changes on the following line: --> --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: --> - [X] `./mach build -d` does not report any errors - [X] `./mach test-tidy` does not report any errors - [ ] These changes fix https://bugzilla.mozilla.org/show_bug.cgi?id=1409255 <!-- Either: --> - [ ] There are tests for these changes OR - [ ] These changes do not require tests because testing is on the Gecko side. <!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.--> <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. --> Source-Repo: https://github.com/servo/servo Source-Revision: 4c538b642e4bdfbf42c522c5a59c258a6d14546e
55 lines
1.4 KiB
Rust
55 lines
1.4 KiB
Rust
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
|
|
//! The `Finite<T>` struct.
|
|
|
|
use malloc_size_of::{MallocSizeOf, MallocSizeOfOps};
|
|
use num_traits::Float;
|
|
use std::default::Default;
|
|
use std::ops::Deref;
|
|
|
|
/// Encapsulates the IDL restricted float type.
|
|
#[derive(Clone, Copy, Eq, JSTraceable, PartialEq)]
|
|
pub struct Finite<T: Float>(T);
|
|
|
|
impl<T: Float> Finite<T> {
|
|
/// Create a new `Finite<T: Float>` safely.
|
|
pub fn new(value: T) -> Option<Finite<T>> {
|
|
if value.is_finite() {
|
|
Some(Finite(value))
|
|
} else {
|
|
None
|
|
}
|
|
}
|
|
|
|
/// Create a new `Finite<T: Float>`.
|
|
#[inline]
|
|
pub fn wrap(value: T) -> Finite<T> {
|
|
assert!(value.is_finite(),
|
|
"Finite<T> doesn't encapsulate unrestricted value.");
|
|
Finite(value)
|
|
}
|
|
}
|
|
|
|
impl<T: Float> Deref for Finite<T> {
|
|
type Target = T;
|
|
|
|
fn deref(&self) -> &T {
|
|
let &Finite(ref value) = self;
|
|
value
|
|
}
|
|
}
|
|
|
|
impl<T: Float + MallocSizeOf> MallocSizeOf for Finite<T> {
|
|
fn size_of(&self, ops: &mut MallocSizeOfOps) -> usize {
|
|
(**self).size_of(ops)
|
|
}
|
|
}
|
|
|
|
impl<T: Float + Default> Default for Finite<T> {
|
|
fn default() -> Finite<T> {
|
|
Finite::wrap(T::default())
|
|
}
|
|
}
|