summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEugen Wissner <belka@caraus.de>2017-01-05 07:42:23 +0100
committerEugen Wissner <belka@caraus.de>2017-01-05 07:42:23 +0100
commita35e04c049ca0d9310315fe46475ba1cd5aa5b6f (patch)
treea5bd4d9d5153f70c8e58cfd02a916f8746766abe
parent4271c8583e712f85fe0073171d4274b96453be86 (diff)
downloadtanya-a35e04c049ca0d9310315fe46475ba1cd5aa5b6f.tar.gz
Don't throw in the allocator, return null
-rw-r--r--source/tanya/memory/mmappool.d19
1 files changed, 5 insertions, 14 deletions
diff --git a/source/tanya/memory/mmappool.d b/source/tanya/memory/mmappool.d
index 1182f72..0e322af 100644
--- a/source/tanya/memory/mmappool.d
+++ b/source/tanya/memory/mmappool.d
@@ -12,7 +12,6 @@ module tanya.memory.mmappool;
import tanya.memory.allocator;
import core.atomic;
-import core.exception;
import core.stdc.string;
version (Posix)
@@ -334,17 +333,13 @@ final class MmapPool : Allocator
version (Posix)
{
void* p = mmap(null,
- regionSize,
- PROT_READ | PROT_WRITE,
- MAP_PRIVATE | MAP_ANON,
- -1,
- 0);
+ regionSize,
+ PROT_READ | PROT_WRITE,
+ MAP_PRIVATE | MAP_ANON,
+ -1,
+ 0);
if (p is MAP_FAILED)
{
- if (errno == ENOMEM)
- {
- onOutOfMemoryError();
- }
return null;
}
}
@@ -356,10 +351,6 @@ final class MmapPool : Allocator
PAGE_READWRITE);
if (p is null)
{
- if (GetLastError() == ERROR_NOT_ENOUGH_MEMORY)
- {
- onOutOfMemoryError();
- }
return null;
}
}