Merge branch 'Erdroy-pagealloc_utils' into 1.1
This commit is contained in:
@@ -316,6 +316,20 @@ public:
|
||||
/// <param name="ptr">A pointer to the memory block to deallocate.</param>
|
||||
static void Free(void* ptr) = delete;
|
||||
|
||||
/// <summary>
|
||||
/// Allocates pages memory block.
|
||||
/// </summary>
|
||||
/// <param name="numPages">The number of pages to allocate.</param>
|
||||
/// <param name="pageSize">The size of single page. Use Platform::GetCPUInfo().PageSize or provide compatible, custom size.</param>
|
||||
/// <returns>The pointer to the allocated pages in memory.</returns>
|
||||
static void* AllocatePages(uint64 numPages, uint64 pageSize) = delete;
|
||||
|
||||
/// <summary>
|
||||
/// Frees allocated pages memory block.
|
||||
/// </summary>
|
||||
/// <param name="ptr">The pointer to the pages to deallocate.</param>
|
||||
static void FreePages(void* ptr) = delete;
|
||||
|
||||
public:
|
||||
|
||||
/// <summary>
|
||||
|
||||
@@ -51,6 +51,20 @@ void UnixPlatform::Free(void* ptr)
|
||||
}
|
||||
}
|
||||
|
||||
void* UnixPlatform::AllocatePages(uint64 numPages, uint64 pageSize)
|
||||
{
|
||||
const uint64 numBytes = numPages * pageSize;
|
||||
|
||||
// Fallback to malloc
|
||||
return malloc(numBytes);
|
||||
}
|
||||
|
||||
void UnixPlatform::FreePages(void* ptr)
|
||||
{
|
||||
// Fallback to free
|
||||
free(ptr);
|
||||
}
|
||||
|
||||
uint64 UnixPlatform::GetCurrentProcessId()
|
||||
{
|
||||
return getpid();
|
||||
|
||||
@@ -16,6 +16,8 @@ public:
|
||||
// [PlatformBase]
|
||||
static void* Allocate(uint64 size, uint64 alignment);
|
||||
static void Free(void* ptr);
|
||||
static void* AllocatePages(uint64 numPages, uint64 pageSize);
|
||||
static void FreePages(void* ptr);
|
||||
static uint64 GetCurrentProcessId();
|
||||
};
|
||||
|
||||
|
||||
@@ -298,6 +298,20 @@ void Win32Platform::AtomicStore(int64 volatile* dst, int64 value)
|
||||
InterlockedExchange64(dst, value);
|
||||
}
|
||||
|
||||
void* Win32Platform::AllocatePages(uint64 numPages, uint64 pageSize)
|
||||
{
|
||||
const uint64 numBytes = numPages * pageSize;
|
||||
|
||||
// Use VirtualAlloc to allocate page-aligned memory
|
||||
return VirtualAlloc(nullptr, numBytes, MEM_COMMIT | MEM_RESERVE, PAGE_READWRITE);
|
||||
}
|
||||
|
||||
void Win32Platform::FreePages(void* ptr)
|
||||
{
|
||||
// Free page-aligned memory
|
||||
VirtualFree(ptr, 0, MEM_RELEASE);
|
||||
}
|
||||
|
||||
bool Win32Platform::Is64BitPlatform()
|
||||
{
|
||||
#ifdef PLATFORM_64BITS
|
||||
|
||||
@@ -43,6 +43,8 @@ public:
|
||||
{
|
||||
_aligned_free(ptr);
|
||||
}
|
||||
static void* AllocatePages(uint64 numPages, uint64 pageSize);
|
||||
static void FreePages(void* ptr);
|
||||
static bool Is64BitPlatform();
|
||||
static BatteryInfo GetBatteryInfo();
|
||||
static CPUInfo GetCPUInfo();
|
||||
|
||||
Reference in New Issue
Block a user