github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-07-11 22:03:01 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

Core: Heap fixes for Win32

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@6663 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2013-12-17 13:13:15 +00:00
parent 850f49dbca
commit c20477ec63
2 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
uppsrc/Core/HeapImp.h
View file

@ -9,8 +9,8 @@ void *LAlloc(size_t& size);
void LFree(void *ptr);
#ifdef MEMORY_SHRINK
void *FreeRaw4KB(void *ptr);
void *FreeRaw64KB(void *ptr);
void FreeRaw4KB(void *ptr);
void FreeRaw64KB(void *ptr);
#endif
struct Heap {

18
uppsrc/Core/heaputil.cpp
View file

@ -73,17 +73,18 @@ void *SysAllocRaw(size_t size, size_t reqsize)
size_t rsz = int(((size + 4095) & ~4095) >> 10);
void *ptr = NULL;
for(int pass = 0; pass < 2; pass++) {
if(sKB + rsz < sKBLimit) {
if(sKB + (int)rsz < sKBLimit) {
#ifdef PLATFORM_WIN32
ptr = VirtualAlloc(NULL, size, MEM_RESERVE|MEM_COMMIT, PAGE_READWRITE);
#else
#ifdef PLATFORM_LINUX
#elif PLATFORM_LINUX
ptr = mmap(0, size, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0);
#else
ptr = mmap(0, size, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANON, -1, 0);
#endif
if(ptr == MAP_FAILED)
ptr = NULL;
#else
ptr = mmap(0, size, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANON, -1, 0);
if(ptr == MAP_FAILED)
ptr = NULL;
#endif
if(ptr)
break;
}
@ -91,7 +92,6 @@ void *SysAllocRaw(size_t size, size_t reqsize)
MemoryShrink(); // Freeing large / small empty might help
#endif
}
#endif
if(!ptr)
OutOfMemoryPanic(reqsize);
sKB += rsz;
@ -131,14 +131,14 @@ void *AllocRaw64KB(int reqsize)
return ptr;
}
void *FreeRaw4KB(void *ptr)
void FreeRaw4KB(void *ptr)
{
RTIMING("FreeRaw4KB");
SysFreeRaw(ptr, 4096);
s4kb__--;
}
void *FreeRaw64KB(void *ptr)
void FreeRaw64KB(void *ptr)
{
RTIMING("FreeRaw64KB");
SysFreeRaw(ptr, 65536);