Add Windows support to tanya.memory.mmappool
This commit is contained in:
parent
07b388eecb
commit
1c5e18b92e
@ -19,6 +19,22 @@ import tanya.memory.allocator;
|
|||||||
import tanya.memory.op;
|
import tanya.memory.op;
|
||||||
import tanya.os.error;
|
import tanya.os.error;
|
||||||
|
|
||||||
|
version (Windows)
|
||||||
|
{
|
||||||
|
import core.sys.windows.basetsd : SIZE_T;
|
||||||
|
import core.sys.windows.windef : BOOL, DWORD;
|
||||||
|
import core.sys.windows.winnt : MEM_COMMIT, MEM_RELEASE, PAGE_READWRITE, PVOID;
|
||||||
|
|
||||||
|
extern (Windows)
|
||||||
|
private PVOID VirtualAlloc(PVOID, SIZE_T, DWORD, DWORD)
|
||||||
|
@nogc nothrow pure @system;
|
||||||
|
|
||||||
|
extern (Windows)
|
||||||
|
private BOOL VirtualFree(shared PVOID, SIZE_T, DWORD)
|
||||||
|
@nogc nothrow pure @system;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
extern(C) pragma(mangle, "mmap")
|
extern(C) pragma(mangle, "mmap")
|
||||||
private void* mapMemory(void *addr, size_t length, int prot, int flags, int fd, off_t offset)
|
private void* mapMemory(void *addr, size_t length, int prot, int flags, int fd, off_t offset)
|
||||||
@nogc nothrow pure @system;
|
@nogc nothrow pure @system;
|
||||||
@ -26,6 +42,7 @@ private void* mapMemory(void *addr, size_t length, int prot, int flags, int fd,
|
|||||||
extern(C) pragma(mangle, "munmap")
|
extern(C) pragma(mangle, "munmap")
|
||||||
private bool unmapMemory(shared void* addr, size_t length)
|
private bool unmapMemory(shared void* addr, size_t length)
|
||||||
@nogc nothrow pure @system;
|
@nogc nothrow pure @system;
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* This allocator allocates memory in regions (multiple of 64 KB for example).
|
* This allocator allocates memory in regions (multiple of 64 KB for example).
|
||||||
@ -192,6 +209,9 @@ final class MmapPool : Allocator
|
|||||||
{
|
{
|
||||||
block.region.next.prev = block.region.prev;
|
block.region.next.prev = block.region.prev;
|
||||||
}
|
}
|
||||||
|
version (Windows)
|
||||||
|
return VirtualFree(block.region, 0, MEM_RELEASE) != 0;
|
||||||
|
else
|
||||||
return unmapMemory(block.region, block.region.size) == 0;
|
return unmapMemory(block.region, block.region.size) == 0;
|
||||||
}
|
}
|
||||||
// Merge blocks if neigbours are free.
|
// Merge blocks if neigbours are free.
|
||||||
@ -380,6 +400,19 @@ final class MmapPool : Allocator
|
|||||||
{
|
{
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
version (Windows)
|
||||||
|
{
|
||||||
|
void* p = VirtualAlloc(null,
|
||||||
|
regionSize,
|
||||||
|
MEM_COMMIT,
|
||||||
|
PAGE_READWRITE);
|
||||||
|
if (p is null)
|
||||||
|
{
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
void* p = mapMemory(null,
|
void* p = mapMemory(null,
|
||||||
regionSize,
|
regionSize,
|
||||||
PROT_READ | PROT_WRITE,
|
PROT_READ | PROT_WRITE,
|
||||||
@ -390,6 +423,7 @@ final class MmapPool : Allocator
|
|||||||
{
|
{
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
Region region = cast(Region) p;
|
Region region = cast(Region) p;
|
||||||
region.blocks = 1;
|
region.blocks = 1;
|
||||||
|
Loading…
Reference in New Issue
Block a user