mirror of
https://github.com/servo/servo.git
synced 2025-06-06 16:45:39 +00:00
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`.
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<()>),
|
|
}
|