-
Notifications
You must be signed in to change notification settings - Fork 282
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #2777 from vibe-d/vibe_container_allocators
Deprecate vibe.internal.utilallocator and forward to vibe.container's version
- Loading branch information
Showing
14 changed files
with
18 additions
and
197 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
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
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
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
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
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 |
|---|---|---|
| @@ -1,183 +1,4 @@ | ||
| deprecated("Import vibe.container.internal.utilallocator instead") | ||
| module vibe.internal.utilallocator; | ||
|
|
||
| public import stdx.allocator : allocatorObject, CAllocatorImpl, dispose, | ||
| expandArray, IAllocator, make, makeArray, shrinkArray, theAllocator; | ||
| public import stdx.allocator.mallocator; | ||
| public import stdx.allocator.building_blocks.affix_allocator; | ||
|
|
||
| // NOTE: this needs to be used instead of theAllocator due to Phobos issue 17564 | ||
| @property IAllocator vibeThreadAllocator() | ||
| @safe nothrow @nogc { | ||
| import stdx.allocator.gc_allocator; | ||
| static IAllocator s_threadAllocator; | ||
| if (!s_threadAllocator) | ||
| s_threadAllocator = () @trusted { return allocatorObject(GCAllocator.instance); } (); | ||
| return s_threadAllocator; | ||
| } | ||
|
|
||
| final class RegionListAllocator(Allocator, bool leak = false) : IAllocator { | ||
| import vibe.internal.memory_legacy : AllocSize, alignedSize; | ||
| import std.algorithm.comparison : min, max; | ||
| import std.conv : emplace; | ||
|
|
||
| import std.typecons : Ternary; | ||
|
|
||
| static struct Pool { Pool* next; void[] data; void[] remaining; } | ||
| private { | ||
| Allocator m_baseAllocator; | ||
| Pool* m_freePools; | ||
| Pool* m_fullPools; | ||
| size_t m_poolSize; | ||
| } | ||
|
|
||
| this(size_t pool_size, Allocator base) @safe nothrow | ||
| { | ||
| m_poolSize = pool_size; | ||
| m_baseAllocator = base; | ||
| } | ||
|
|
||
| ~this() | ||
| { | ||
| deallocateAll(); | ||
| } | ||
|
|
||
| override @property uint alignment() const { return 0x10; } | ||
|
|
||
| @property size_t totalSize() | ||
| @safe nothrow @nogc { | ||
| size_t amt = 0; | ||
| for (auto p = m_fullPools; p; p = p.next) | ||
| amt += p.data.length; | ||
| for (auto p = m_freePools; p; p = p.next) | ||
| amt += p.data.length; | ||
| return amt; | ||
| } | ||
|
|
||
| @property size_t allocatedSize() | ||
| @safe nothrow @nogc { | ||
| size_t amt = 0; | ||
| for (auto p = m_fullPools; p; p = p.next) | ||
| amt += p.data.length; | ||
| for (auto p = m_freePools; p; p = p.next) | ||
| amt += p.data.length - p.remaining.length; | ||
| return amt; | ||
| } | ||
|
|
||
| override void[] allocate(size_t sz, TypeInfo ti = null) | ||
| { | ||
| auto aligned_sz = alignedSize(sz); | ||
|
|
||
| Pool* pprev = null; | ||
| Pool* p = cast(Pool*)m_freePools; | ||
| while( p && p.remaining.length < aligned_sz ){ | ||
| pprev = p; | ||
| p = p.next; | ||
| } | ||
|
|
||
| if( !p ){ | ||
| auto pmem = m_baseAllocator.allocate(AllocSize!Pool); | ||
|
|
||
| p = emplace!Pool(cast(Pool*)pmem.ptr); | ||
| p.data = m_baseAllocator.allocate(max(aligned_sz, m_poolSize)); | ||
| p.remaining = p.data; | ||
| p.next = cast(Pool*)m_freePools; | ||
| m_freePools = p; | ||
| pprev = null; | ||
| } | ||
|
|
||
| auto ret = p.remaining[0 .. aligned_sz]; | ||
| p.remaining = p.remaining[aligned_sz .. $]; | ||
| if( !p.remaining.length ){ | ||
| if( pprev ){ | ||
| pprev.next = p.next; | ||
| } else { | ||
| m_freePools = p.next; | ||
| } | ||
| p.next = cast(Pool*)m_fullPools; | ||
| m_fullPools = p; | ||
| } | ||
|
|
||
| return ret[0 .. sz]; | ||
| } | ||
|
|
||
| override void[] alignedAllocate(size_t n, uint a) { return null; } | ||
| override bool alignedReallocate(ref void[] b, size_t size, uint alignment) { return false; } | ||
| override void[] allocateAll() { return null; } | ||
| override @property Ternary empty() const { return m_fullPools !is null ? Ternary.no : Ternary.yes; } | ||
| override size_t goodAllocSize(size_t s) { return alignedSize(s); } | ||
|
|
||
| import std.traits : Parameters; | ||
| static if (is(Parameters!(IAllocator.resolveInternalPointer)[0] == const(void*))) { | ||
| override Ternary resolveInternalPointer(const void* p, ref void[] result) { return Ternary.unknown; } | ||
| } else { | ||
| override Ternary resolveInternalPointer(void* p, ref void[] result) { return Ternary.unknown; } | ||
| } | ||
| static if (is(Parameters!(IAllocator.owns)[0] == const(void[]))) { | ||
| override Ternary owns(const void[] b) { return Ternary.unknown; } | ||
| } else { | ||
| override Ternary owns(void[] b) { return Ternary.unknown; } | ||
| } | ||
|
|
||
|
|
||
| override bool reallocate(ref void[] arr, size_t newsize) | ||
| { | ||
| return expand(arr, newsize); | ||
| } | ||
|
|
||
| override bool expand(ref void[] arr, size_t newsize) | ||
| { | ||
| auto aligned_sz = alignedSize(arr.length); | ||
| auto aligned_newsz = alignedSize(newsize); | ||
|
|
||
| if (aligned_newsz <= aligned_sz) { | ||
| arr = arr[0 .. newsize]; // TODO: back up remaining | ||
| return true; | ||
| } | ||
|
|
||
| auto pool = m_freePools; | ||
| bool last_in_pool = pool && arr.ptr+aligned_sz == pool.remaining.ptr; | ||
| if (last_in_pool && pool.remaining.length+aligned_sz >= aligned_newsz) { | ||
| pool.remaining = pool.remaining[aligned_newsz-aligned_sz .. $]; | ||
| arr = arr.ptr[0 .. aligned_newsz]; | ||
| assert(arr.ptr+arr.length == pool.remaining.ptr, "Last block does not align with the remaining space!?"); | ||
| arr = arr[0 .. newsize]; | ||
| } else { | ||
| auto ret = allocate(newsize); | ||
| assert(ret.ptr >= arr.ptr+aligned_sz || ret.ptr+ret.length <= arr.ptr, "New block overlaps old one!?"); | ||
| ret[0 .. min(arr.length, newsize)] = arr[0 .. min(arr.length, newsize)]; | ||
| arr = ret; | ||
| } | ||
| return true; | ||
| } | ||
|
|
||
| override bool deallocate(void[] mem) | ||
| { | ||
| return false; | ||
| } | ||
|
|
||
| override bool deallocateAll() | ||
| { | ||
| // put all full Pools into the free pools list | ||
| for (Pool* p = cast(Pool*)m_fullPools, pnext; p; p = pnext) { | ||
| pnext = p.next; | ||
| p.next = cast(Pool*)m_freePools; | ||
| m_freePools = cast(Pool*)p; | ||
| } | ||
|
|
||
| // free up all pools | ||
| for (Pool* p = cast(Pool*)m_freePools; p; p = p.next) | ||
| p.remaining = p.data; | ||
|
|
||
| Pool* pnext; | ||
| for (auto p = cast(Pool*)m_freePools; p; p = pnext) { | ||
| pnext = p.next; | ||
| static if (!leak) { | ||
| m_baseAllocator.deallocate(p.data); | ||
| m_baseAllocator.deallocate((cast(void*)p)[0 .. AllocSize!Pool]); | ||
| } | ||
| } | ||
| m_freePools = null; | ||
|
|
||
| return true; | ||
| } | ||
| } | ||
| public import vibe.container.internal.utilallocator; |
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