-
Notifications
You must be signed in to change notification settings - Fork 12.5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[scudo] Make local cache be agnostic to the type of node in freelist (#…
…67379) This change moves the `TransferBatch` and `BatchGroup` out of SizeClassAllocatorLocalCache. It allows us that the node in freelist can store more blocks instead of depending on the number of blocks cached. That means we will be able to store more blocks in each node of freelist and therefore reduce the memory used by BatchClass (with little performance overhead). Note that we haven't enabled that in this patch. This is the first step of this transition.
- Loading branch information
1 parent
7a73da4
commit b9c6737
Showing
6 changed files
with
167 additions
and
118 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,85 @@ | ||
| //===-- allocator_common.h --------------------------------------*- C++ -*-===// | ||
| // | ||
| // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. | ||
| // See https://llvm.org/LICENSE.txt for license information. | ||
| // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception | ||
| // | ||
| //===----------------------------------------------------------------------===// | ||
|
|
||
| #ifndef SCUDO_ALLOCATOR_COMMON_H_ | ||
| #define SCUDO_ALLOCATOR_COMMON_H_ | ||
|
|
||
| #include "common.h" | ||
| #include "list.h" | ||
|
|
||
| namespace scudo { | ||
|
|
||
| template <class SizeClassAllocator> struct TransferBatch { | ||
| typedef typename SizeClassAllocator::SizeClassMap SizeClassMap; | ||
| typedef typename SizeClassAllocator::CompactPtrT CompactPtrT; | ||
|
|
||
| static const u16 MaxNumCached = SizeClassMap::MaxNumCachedHint; | ||
| void setFromArray(CompactPtrT *Array, u16 N) { | ||
| DCHECK_LE(N, MaxNumCached); | ||
| Count = N; | ||
| memcpy(Batch, Array, sizeof(Batch[0]) * Count); | ||
| } | ||
| void appendFromArray(CompactPtrT *Array, u16 N) { | ||
| DCHECK_LE(N, MaxNumCached - Count); | ||
| memcpy(Batch + Count, Array, sizeof(Batch[0]) * N); | ||
| // u16 will be promoted to int by arithmetic type conversion. | ||
| Count = static_cast<u16>(Count + N); | ||
| } | ||
| void appendFromTransferBatch(TransferBatch *B, u16 N) { | ||
| DCHECK_LE(N, MaxNumCached - Count); | ||
| DCHECK_GE(B->Count, N); | ||
| // Append from the back of `B`. | ||
| memcpy(Batch + Count, B->Batch + (B->Count - N), sizeof(Batch[0]) * N); | ||
| // u16 will be promoted to int by arithmetic type conversion. | ||
| Count = static_cast<u16>(Count + N); | ||
| B->Count = static_cast<u16>(B->Count - N); | ||
| } | ||
| void clear() { Count = 0; } | ||
| void add(CompactPtrT P) { | ||
| DCHECK_LT(Count, MaxNumCached); | ||
| Batch[Count++] = P; | ||
| } | ||
| void moveToArray(CompactPtrT *Array) { | ||
| memcpy(Array, Batch, sizeof(Batch[0]) * Count); | ||
| clear(); | ||
| } | ||
| u16 getCount() const { return Count; } | ||
| bool isEmpty() const { return Count == 0U; } | ||
| CompactPtrT get(u16 I) const { | ||
| DCHECK_LE(I, Count); | ||
| return Batch[I]; | ||
| } | ||
| TransferBatch *Next; | ||
|
|
||
| private: | ||
| CompactPtrT Batch[MaxNumCached]; | ||
| u16 Count; | ||
| }; | ||
|
|
||
| // A BatchGroup is used to collect blocks. Each group has a group id to | ||
| // identify the group kind of contained blocks. | ||
| template <class SizeClassAllocator> struct BatchGroup { | ||
| // `Next` is used by IntrusiveList. | ||
| BatchGroup *Next; | ||
| // The compact base address of each group | ||
| uptr CompactPtrGroupBase; | ||
| // Cache value of SizeClassAllocatorLocalCache::getMaxCached() | ||
| u16 MaxCachedPerBatch; | ||
| // Number of blocks pushed into this group. This is an increment-only | ||
| // counter. | ||
| uptr PushedBlocks; | ||
| // This is used to track how many bytes are not in-use since last time we | ||
| // tried to release pages. | ||
| uptr BytesInBGAtLastCheckpoint; | ||
| // Blocks are managed by TransferBatch in a list. | ||
| SinglyLinkedList<TransferBatch<SizeClassAllocator>> Batches; | ||
| }; | ||
|
|
||
| } // namespace scudo | ||
|
|
||
| #endif // SCUDO_ALLOCATOR_COMMON_H_ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.