mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-27 12:15:33 +00:00
5a62942911
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 --HG-- extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear extra : subtree_revision : f9a6feed1088d0b0be2b55d7f0c2ec9c594ac33b
127 lines
4.3 KiB
Rust
127 lines
4.3 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/. */
|
|
|
|
//! Various macro helpers.
|
|
|
|
macro_rules! trivial_to_computed_value {
|
|
($name:ty) => {
|
|
impl $crate::values::computed::ToComputedValue for $name {
|
|
type ComputedValue = $name;
|
|
|
|
fn to_computed_value(&self, _: &$crate::values::computed::Context) -> Self {
|
|
self.clone()
|
|
}
|
|
|
|
fn from_computed_value(other: &Self) -> Self {
|
|
other.clone()
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
/// A macro to parse an identifier, or return an `UnexpectedIndent` error
|
|
/// otherwise.
|
|
///
|
|
/// FIXME(emilio): The fact that `UnexpectedIdent` is a `SelectorParseError`
|
|
/// doesn't make a lot of sense to me.
|
|
macro_rules! try_match_ident_ignore_ascii_case {
|
|
($input:expr, $( $match_body:tt )*) => {
|
|
let location = $input.current_source_location();
|
|
let ident = $input.expect_ident_cloned()?;
|
|
(match_ignore_ascii_case! { &ident,
|
|
$( $match_body )*
|
|
_ => Err(()),
|
|
})
|
|
.map_err(|()| {
|
|
location.new_custom_error(
|
|
::selectors::parser::SelectorParseErrorKind::UnexpectedIdent(ident.clone())
|
|
)
|
|
})
|
|
}
|
|
}
|
|
|
|
macro_rules! define_numbered_css_keyword_enum {
|
|
($name: ident: $( $css: expr => $variant: ident = $value: expr ),+,) => {
|
|
define_numbered_css_keyword_enum!($name: $( $css => $variant = $value ),+);
|
|
};
|
|
($name: ident: $( $css: expr => $variant: ident = $value: expr ),+) => {
|
|
#[allow(non_camel_case_types, missing_docs)]
|
|
#[derive(Clone, Copy, Debug, Eq, MallocSizeOf, Ord, PartialEq, PartialOrd)]
|
|
#[cfg_attr(feature = "servo", derive(Deserialize, Serialize))]
|
|
pub enum $name {
|
|
$( $variant = $value ),+
|
|
}
|
|
|
|
impl $crate::parser::Parse for $name {
|
|
fn parse<'i, 't>(
|
|
_context: &$crate::parser::ParserContext,
|
|
input: &mut ::cssparser::Parser<'i, 't>,
|
|
) -> Result<$name, ::style_traits::ParseError<'i>> {
|
|
try_match_ident_ignore_ascii_case! { input,
|
|
$( $css => Ok($name::$variant), )+
|
|
}
|
|
}
|
|
}
|
|
|
|
impl ::style_traits::values::ToCss for $name {
|
|
fn to_css<W>(&self, dest: &mut W) -> ::std::fmt::Result
|
|
where
|
|
W: ::std::fmt::Write,
|
|
{
|
|
match *self {
|
|
$( $name::$variant => dest.write_str($css) ),+
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
/// A macro for implementing `ToComputedValue`, and `Parse` traits for
|
|
/// the enums defined using `define_css_keyword_enum` macro.
|
|
///
|
|
/// NOTE: We should either move `Parse` trait to `style_traits`
|
|
/// or `define_css_keyword_enum` macro to this crate, but that
|
|
/// may involve significant cleanup in both the crates.
|
|
macro_rules! add_impls_for_keyword_enum {
|
|
($name:ident) => {
|
|
impl $crate::parser::Parse for $name {
|
|
#[inline]
|
|
fn parse<'i, 't>(
|
|
_context: &$crate::parser::ParserContext,
|
|
input: &mut ::cssparser::Parser<'i, 't>,
|
|
) -> Result<Self, ::style_traits::ParseError<'i>> {
|
|
$name::parse(input)
|
|
}
|
|
}
|
|
|
|
trivial_to_computed_value!($name);
|
|
};
|
|
}
|
|
|
|
macro_rules! define_keyword_type {
|
|
($name: ident, $css: expr) => {
|
|
#[allow(missing_docs)]
|
|
#[derive(Animate, Clone, ComputeSquaredDistance, Copy, MallocSizeOf, PartialEq)]
|
|
#[derive(ToAnimatedZero, ToComputedValue, ToCss)]
|
|
pub struct $name;
|
|
|
|
impl fmt::Debug for $name {
|
|
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
|
|
f.write_str($css)
|
|
}
|
|
}
|
|
|
|
impl $crate::parser::Parse for $name {
|
|
fn parse<'i, 't>(
|
|
_context: &$crate::parser::ParserContext,
|
|
input: &mut ::cssparser::Parser<'i, 't>
|
|
) -> Result<$name, ::style_traits::ParseError<'i>> {
|
|
input.expect_ident_matching($css).map(|_| $name).map_err(|e| e.into())
|
|
}
|
|
}
|
|
|
|
impl $crate::values::animated::AnimatedValueAsComputed for $name {}
|
|
};
|
|
}
|