forked from mirrors/gecko-dev
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
40 lines
1.6 KiB
Rust
40 lines
1.6 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 ipc_channel::ipc::IpcSender;
|
|
use servo_url::ServoUrl;
|
|
|
|
#[derive(Clone, Copy, Deserialize, MallocSizeOf, Serialize)]
|
|
pub enum StorageType {
|
|
Session,
|
|
Local,
|
|
}
|
|
|
|
/// Request operations on the storage data associated with a particular url
|
|
#[derive(Deserialize, Serialize)]
|
|
pub enum StorageThreadMsg {
|
|
/// gets the number of key/value pairs present in the associated storage data
|
|
Length(IpcSender<usize>, ServoUrl, StorageType),
|
|
|
|
/// gets the name of the key at the specified index in the associated storage data
|
|
Key(IpcSender<Option<String>>, ServoUrl, StorageType, u32),
|
|
|
|
/// Gets the available keys in the associated storage data
|
|
Keys(IpcSender<Vec<String>>, ServoUrl, StorageType),
|
|
|
|
/// gets the value associated with the given key in the associated storage data
|
|
GetItem(IpcSender<Option<String>>, ServoUrl, StorageType, String),
|
|
|
|
/// sets the value of the given key in the associated storage data
|
|
SetItem(IpcSender<Result<(bool, Option<String>), ()>>, ServoUrl, StorageType, String, String),
|
|
|
|
/// removes the key/value pair for the given key in the associated storage data
|
|
RemoveItem(IpcSender<Option<String>>, ServoUrl, StorageType, String),
|
|
|
|
/// clears the associated storage data by removing all the key/value pairs
|
|
Clear(IpcSender<bool>, ServoUrl, StorageType),
|
|
|
|
/// send a reply when done cleaning up thread resources and then shut it down
|
|
Exit(IpcSender<()>),
|
|
}
|