kbz_8/MacroLibX
1
0
Fork 0
mirror of https://github.com/seekrs/MacroLibX.git synced 2026-01-11 22:53:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

working on garbage collection, fixing small issues with font destroy

Browse Source
This commit is contained in:
Kbz-8
2024-12-14 01:39:50 +01:00
parent 5d4d97e05d
commit f5333882c6
9 changed files with 90 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
runtime/Sources/Core/Memory.cpp
View File

@@ -15,15 +15,24 @@ namespace mlx
{
void* ptr = std::malloc(size);
if(ptr != nullptr)
s_blocks.push_back(ptr);
s_blocks.emplace_back(ptr, size, false);
return ptr;
}
void* MemManager::AlignedMalloc(std::size_t alignment, std::size_t size)
{
void* ptr = std::aligned_alloc(alignment, size);
if(alignment < sizeof(void*))
alignment = sizeof(void*);
if(size % alignment != 0)
size += alignment - (size % alignment);
#ifdef MLX_COMPILER_MSVC
void* ptr = _aligned_malloc(alignment, size);
#else
void* ptr = std::aligned_alloc(alignment, size);
#endif
if(ptr != nullptr)
s_blocks.push_back(ptr);
s_blocks.emplace_back(ptr, size, true);
return ptr;
}
@@ -31,7 +40,14 @@ namespace mlx
{
void* ptr = std::calloc(n, size);
if(ptr != nullptr)
s_blocks.push_back(ptr);
s_blocks.emplace_back(ptr, n * size, false);
return ptr;
}
void* MemManager::AlignedCalloc(std::size_t alignment, std::size_t n, std::size_t size)
{
void* ptr = AlignedMalloc(alignment, n * size);
std::memset(ptr, 0, n * size);
return ptr;
}
@@ -39,33 +55,65 @@ namespace mlx
{
void* ptr2 = std::realloc(ptr, size);
if(ptr2 != nullptr)
s_blocks.push_back(ptr2);
auto it = std::find(s_blocks.begin(), s_blocks.end(), ptr);
s_blocks.emplace_back(ptr, size, false);
auto it = std::find_if(s_blocks.begin(), s_blocks.end(), [=](const Descriptor& rhs){ return ptr == rhs.ptr; });
if(it != s_blocks.end())
s_blocks.erase(it);
return ptr2;
}
void* MemManager::AlignedRealloc(void* ptr, std::size_t alignment, std::size_t size)
{
auto it = std::find_if(s_blocks.begin(), s_blocks.end(), [=](const Descriptor& rhs){ return ptr == rhs.ptr; });
#ifdef MLX_COMPILER_MSVC
void* ptr2 = _aligned_realloc(ptr, alignment, size);
#else
void* ptr2 = AlignedMalloc(alignment, size);
if(it != s_blocks.end())
std::memcpy(ptr2, ptr, it->size);
#endif
if(it != s_blocks.end())
s_blocks.erase(it);
if(ptr2 != nullptr)
s_blocks.emplace_back(ptr, size, true);
return ptr2;
}
void MemManager::Free(void* ptr)
{
if(ptr == nullptr)
return;
auto it = std::find(s_blocks.begin(), s_blocks.end(), ptr);
auto it = std::find_if(s_blocks.begin(), s_blocks.end(), [=](const Descriptor& rhs){ return ptr == rhs.ptr; });
if(it == s_blocks.end())
{
Error("Memory Manager: trying to free a pointer not allocated by the memory manager");
return;
}
std::free(*it);
#ifdef MLX_COMPILER_MSVC
if(it->aligned)
_aligned_free(it->ptr);
else
std::free(it->ptr);
#else
std::free(it->ptr);
#endif
s_blocks.erase(it);
}
MemManager::~MemManager()
{
std::for_each(s_blocks.begin(), s_blocks.end(), [](void* ptr)
for(const Descriptor& desc : s_blocks)
{
std::free(ptr);
});
#ifdef MLX_COMPILER_MSVC
if(it->aligned)
_aligned_free(desc.ptr);
else
std::free(desc.ptr);
#else
std::free(desc.ptr);
#endif
}
DebugLog("Memory Manager: finished garbage collection");
s_instance = nullptr;
}
}