Unverified Commit 111f3345 authored by Tobias Koppers's avatar Tobias Koppers Committed by GitHub

[Turbopack] box InnerStorage to avoid overallocation (#75287)

### What?

This reduces the overallocated memory by InnerStorage instances in the DashMap capacity
parent 1ab88376
...@@ -296,7 +296,7 @@ impl InnerStorage { ...@@ -296,7 +296,7 @@ impl InnerStorage {
} }
pub struct Storage { pub struct Storage {
map: DashMap<TaskId, InnerStorage, BuildHasherDefault<FxHasher>>, map: DashMap<TaskId, Box<InnerStorage>, BuildHasherDefault<FxHasher>>,
} }
impl Storage { impl Storage {
...@@ -315,7 +315,7 @@ impl Storage { ...@@ -315,7 +315,7 @@ impl Storage {
pub fn access_mut(&self, key: TaskId) -> StorageWriteGuard<'_> { pub fn access_mut(&self, key: TaskId) -> StorageWriteGuard<'_> {
let inner = match self.map.entry(key) { let inner = match self.map.entry(key) {
dashmap::mapref::entry::Entry::Occupied(e) => e.into_ref(), dashmap::mapref::entry::Entry::Occupied(e) => e.into_ref(),
dashmap::mapref::entry::Entry::Vacant(e) => e.insert(InnerStorage::new()), dashmap::mapref::entry::Entry::Vacant(e) => e.insert(Box::new(InnerStorage::new())),
}; };
StorageWriteGuard { StorageWriteGuard {
inner: inner.into(), inner: inner.into(),
...@@ -327,7 +327,7 @@ impl Storage { ...@@ -327,7 +327,7 @@ impl Storage {
key1: TaskId, key1: TaskId,
key2: TaskId, key2: TaskId,
) -> (StorageWriteGuard<'_>, StorageWriteGuard<'_>) { ) -> (StorageWriteGuard<'_>, StorageWriteGuard<'_>) {
let (a, b) = get_multiple_mut(&self.map, key1, key2, InnerStorage::new); let (a, b) = get_multiple_mut(&self.map, key1, key2, || Box::new(InnerStorage::new()));
( (
StorageWriteGuard { inner: a }, StorageWriteGuard { inner: a },
StorageWriteGuard { inner: b }, StorageWriteGuard { inner: b },
...@@ -336,7 +336,7 @@ impl Storage { ...@@ -336,7 +336,7 @@ impl Storage {
} }
pub struct StorageWriteGuard<'a> { pub struct StorageWriteGuard<'a> {
inner: RefMut<'a, TaskId, InnerStorage>, inner: RefMut<'a, TaskId, Box<InnerStorage>>,
} }
impl Deref for StorageWriteGuard<'_> { impl Deref for StorageWriteGuard<'_> {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment