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
168 lines
4.8 KiB
Rust
168 lines
4.8 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/. */
|
|
|
|
use servo_rand;
|
|
use servo_rand::Rng;
|
|
use std::cell::RefCell;
|
|
use std::rc::Rc;
|
|
use url::{Host, Origin};
|
|
use url_serde;
|
|
use uuid::Uuid;
|
|
|
|
/// The origin of an URL
|
|
#[derive(Clone, Debug, Deserialize, Eq, MallocSizeOf, PartialEq, Serialize)]
|
|
pub enum ImmutableOrigin {
|
|
/// A globally unique identifier
|
|
Opaque(OpaqueOrigin),
|
|
|
|
/// Consists of the URL's scheme, host and port
|
|
Tuple(
|
|
String,
|
|
#[serde(deserialize_with = "url_serde::deserialize", serialize_with = "url_serde::serialize")]
|
|
Host,
|
|
u16,
|
|
)
|
|
}
|
|
|
|
impl ImmutableOrigin {
|
|
pub fn new(origin: Origin) -> ImmutableOrigin {
|
|
match origin {
|
|
Origin::Opaque(_) => ImmutableOrigin::new_opaque(),
|
|
Origin::Tuple(scheme, host, port) => ImmutableOrigin::Tuple(scheme, host, port),
|
|
}
|
|
}
|
|
|
|
pub fn same_origin(&self, other: &MutableOrigin) -> bool {
|
|
self == other.immutable()
|
|
}
|
|
|
|
pub fn same_origin_domain(&self, other: &MutableOrigin) -> bool {
|
|
!other.has_domain() && self == other.immutable()
|
|
}
|
|
|
|
/// Creates a new opaque origin that is only equal to itself.
|
|
pub fn new_opaque() -> ImmutableOrigin {
|
|
ImmutableOrigin::Opaque(OpaqueOrigin(servo_rand::thread_rng().gen()))
|
|
}
|
|
|
|
pub fn scheme(&self) -> Option<&str> {
|
|
match *self {
|
|
ImmutableOrigin::Opaque(_) => None,
|
|
ImmutableOrigin::Tuple(ref scheme, _, _) => Some(&**scheme),
|
|
}
|
|
}
|
|
|
|
pub fn host(&self) -> Option<&Host> {
|
|
match *self {
|
|
ImmutableOrigin::Opaque(_) => None,
|
|
ImmutableOrigin::Tuple(_, ref host, _) => Some(host),
|
|
}
|
|
}
|
|
|
|
pub fn port(&self) -> Option<u16> {
|
|
match *self {
|
|
ImmutableOrigin::Opaque(_) => None,
|
|
ImmutableOrigin::Tuple(_, _, port) => Some(port),
|
|
}
|
|
}
|
|
|
|
pub fn into_url_origin(self) -> Origin {
|
|
match self {
|
|
ImmutableOrigin::Opaque(_) => Origin::new_opaque(),
|
|
ImmutableOrigin::Tuple(scheme, host, port) => Origin::Tuple(scheme, host, port),
|
|
}
|
|
}
|
|
|
|
/// Return whether this origin is a (scheme, host, port) tuple
|
|
/// (as opposed to an opaque origin).
|
|
pub fn is_tuple(&self) -> bool {
|
|
match *self {
|
|
ImmutableOrigin::Opaque(..) => false,
|
|
ImmutableOrigin::Tuple(..) => true,
|
|
}
|
|
}
|
|
|
|
/// <https://html.spec.whatwg.org/multipage/#ascii-serialisation-of-an-origin>
|
|
pub fn ascii_serialization(&self) -> String {
|
|
self.clone().into_url_origin().ascii_serialization()
|
|
}
|
|
|
|
/// <https://html.spec.whatwg.org/multipage/#unicode-serialisation-of-an-origin>
|
|
pub fn unicode_serialization(&self) -> String {
|
|
self.clone().into_url_origin().unicode_serialization()
|
|
}
|
|
}
|
|
|
|
/// Opaque identifier for URLs that have file or other schemes
|
|
#[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize)]
|
|
pub struct OpaqueOrigin(Uuid);
|
|
|
|
malloc_size_of_is_0!(OpaqueOrigin);
|
|
|
|
/// A representation of an [origin](https://html.spec.whatwg.org/multipage/#origin-2).
|
|
#[derive(Clone, Debug)]
|
|
pub struct MutableOrigin(Rc<(ImmutableOrigin, RefCell<Option<Host>>)>);
|
|
|
|
malloc_size_of_is_0!(MutableOrigin);
|
|
|
|
impl MutableOrigin {
|
|
pub fn new(origin: ImmutableOrigin) -> MutableOrigin {
|
|
MutableOrigin(Rc::new((origin, RefCell::new(None))))
|
|
}
|
|
|
|
pub fn immutable(&self) -> &ImmutableOrigin {
|
|
&(self.0).0
|
|
}
|
|
|
|
pub fn is_tuple(&self) -> bool {
|
|
self.immutable().is_tuple()
|
|
}
|
|
|
|
pub fn scheme(&self) -> Option<&str> {
|
|
self.immutable().scheme()
|
|
}
|
|
|
|
pub fn host(&self) -> Option<&Host> {
|
|
self.immutable().host()
|
|
}
|
|
|
|
pub fn port(&self) -> Option<u16> {
|
|
self.immutable().port()
|
|
}
|
|
|
|
pub fn same_origin(&self, other: &MutableOrigin) -> bool {
|
|
self.immutable() == other.immutable()
|
|
}
|
|
|
|
pub fn same_origin_domain(&self, other: &MutableOrigin) -> bool {
|
|
if let Some(ref self_domain) = *(self.0).1.borrow() {
|
|
if let Some(ref other_domain) = *(other.0).1.borrow() {
|
|
self_domain == other_domain &&
|
|
self.immutable().scheme() == other.immutable().scheme()
|
|
} else {
|
|
false
|
|
}
|
|
} else {
|
|
self.immutable().same_origin_domain(other)
|
|
}
|
|
}
|
|
|
|
pub fn domain(&self) -> Option<Host> {
|
|
(self.0).1.borrow().clone()
|
|
}
|
|
|
|
pub fn set_domain(&self, domain: Host) {
|
|
*(self.0).1.borrow_mut() = Some(domain);
|
|
}
|
|
|
|
pub fn has_domain(&self) -> bool {
|
|
(self.0).1.borrow().is_some()
|
|
}
|
|
|
|
pub fn effective_domain(&self) -> Option<Host> {
|
|
self.immutable().host()
|
|
.map(|host| self.domain().unwrap_or_else(|| host.clone()))
|
|
}
|
|
}
|