github-starred/ultimatepp
Watch
2
0
Fork
You've already forked ultimatepp
 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-10-06 00:30:10 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

temporary mingw thread_local in heap fix

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@9760 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2016-05-01 22:01:10 +00:00
commit dea2531e24
4 changed files with 29 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

43
uppsrc/Core/sheap.cpp
View file

@ -294,33 +294,38 @@ void Heap::Free48(void *ptr)
Free(ptr, KLASS_48);
}
void *MemoryAllok__(int klass)
{
return heap.Allok(klass);
}
thread_local byte sHeap[sizeof(Heap)]; // Mingw has issues with class thread_local
thread_local Heap *heap = (Heap *)sHeap;
void MemoryFreek__(int klass, void *ptr)
{
heap.Free(ptr, klass);
heap->Free((void *)ptr, klass);
}
void *MemoryAllok__(int klass)
{
return heap->Allok(klass);
}
thread_local Heap heap;
#if defined(HEAPDBG)
void *MemoryAlloc_(size_t sz)
{
return heap.AllocSz(sz);
if(!heap)
heap = (Heap *)sHeap;
return heap->AllocSz(sz);
}
void MemoryFree_(void *ptr)
{
heap.Free(ptr);
heap->Free(ptr);
}
size_t GetMemoryBlockSize_(void *ptr)
{
return heap.GetBlockSize(ptr);
return heap->GetBlockSize(ptr);
}
#else
@ -330,53 +335,55 @@ size_t GetMemoryBlockSize_(void *ptr)
void *MemoryAlloc(size_t sz)
{
LTIMING("MemoryAlloc");
return heap.AllocSz(sz);
if(!heap)
heap = (Heap *)sHeap;
return heap->AllocSz(sz);
}
void *MemoryAllocSz(size_t& sz)
{
LTIMING("MemoryAllocSz");
return heap.AllocSz(sz);
return heap->AllocSz(sz);
}
void MemoryFree(void *ptr)
{
LTIMING("MemoryFree");
heap.Free(ptr);
heap->Free(ptr);
}
size_t GetMemoryBlockSize(void *ptr)
{
return heap.GetBlockSize(ptr);
return heap->GetBlockSize(ptr);
}
bool TryRealloc(void *ptr, size_t size)
{
return heap.TryRealloc(ptr, size);
return heap->TryRealloc(ptr, size);
}
void *MemoryAlloc32()
{
LTIMING("MemoryAlloc32");
return heap.Alloc32();
return heap->Alloc32();
}
void MemoryFree32(void *ptr)
{
LTIMING("MemoryFree32");
heap.Free32(ptr);
heap->Free32(ptr);
}
void *MemoryAlloc48()
{
LTIMING("MemoryAlloc48");
return heap.Alloc48();
return heap->Alloc48();
}
void MemoryFree48(void *ptr)
{
LTIMING("MemoryFree48");
heap.Free48(ptr);
heap->Free48(ptr);
}
#endif