OSS/tanya
1
0
Fork 0
Code Issues 1 Pull Requests Releases Activity

math.mp: Fix initialization issues after resizing

Browse Source
This commit is contained in:
Eugen Wissner 2017-03-23 15:36:17 +01:00
parent 7892c1a930
commit 402fdfae89
2 changed files with 1260 additions and 1248 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2489
source/tanya/math/mp.d
View File

File diff suppressed because it is too large Load Diff

19
source/tanya/memory/package.d
View File

@ -87,8 +87,8 @@ shared Allocator allocator;
shared static this() nothrow @trusted @nogc shared static this() nothrow @trusted @nogc
{ {
import tanya.memory.mmappool; import tanya.memory.mallocator;
allocator = MmapPool.instance; allocator = Mallocator.instance;
} }
@property ref shared(Allocator) defaultAllocator() nothrow @safe @nogc @property ref shared(Allocator) defaultAllocator() nothrow @safe @nogc
@ -162,11 +162,22 @@ package(tanya) T[] resize(T)(shared Allocator allocator,
auto ref T[] array, auto ref T[] array,
const size_t length) @trusted const size_t length) @trusted
{ {
void[] buf = array; if (length == 0)
{
if (allocator.deallocate(array))
{
return null;
}
else
{
onOutOfMemoryErrorNoGC();
}
}
void[] buf = array;
if (!allocator.reallocate(buf, length * T.sizeof)) if (!allocator.reallocate(buf, length * T.sizeof))
{ {
onOutOfMemoryError; onOutOfMemoryErrorNoGC();
} }
// Casting from void[] is unsafe, but we know we cast to the original type. // Casting from void[] is unsafe, but we know we cast to the original type.
array = cast(T[]) buf; array = cast(T[]) buf;