tri11paragon
/
BLT
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix some issue with the allocator

v1
Brett 2024-03-24 17:31:11 -04:00
parent 9950fd3c94
commit f100e95a30
2 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 3.5) cmake_minimum_required(VERSION 3.5)
include(cmake/color.cmake) include(cmake/color.cmake)
set(BLT_VERSION 0.15.6) set(BLT_VERSION 0.15.7)
set(BLT_TEST_VERSION 0.0.1) set(BLT_TEST_VERSION 0.0.1)
set(BLT_TARGET BLT) set(BLT_TARGET BLT)

27
include/blt/std/allocator.h
View File

@ -24,6 +24,8 @@
#include <blt/std/ranges.h> #include <blt/std/ranges.h>
#include <blt/std/utility.h> #include <blt/std/utility.h>
#include <blt/std/types.h> #include <blt/std/types.h>
// TODO: remove
//#include <blt/std/hashmap.h>
#include <blt/compatibility.h> #include <blt/compatibility.h>
#include <stdexcept> #include <stdexcept>
#include "logging.h" #include "logging.h"
@ -623,6 +625,7 @@ namespace blt
private: private:
stats_t stats; stats_t stats;
//blt::hashset_t<void*> deletes;
/** /**
* Logging function used for handling mmap errors. call after a failed mmap call. * Logging function used for handling mmap errors. call after a failed mmap call.
@ -695,7 +698,7 @@ namespace blt
block* prev = nullptr; block* prev = nullptr;
blt::u8* offset = nullptr; blt::u8* offset = nullptr;
} metadata; } metadata;
blt::u8 buffer[BLOCK_SIZE - sizeof(metadata)]{}; blt::u8 buffer[BLOCK_SIZE - sizeof(block_metadata_t)]{};
block() block()
{ {
@ -884,14 +887,30 @@ namespace blt
#ifndef BLT_DISABLE_STATS #ifndef BLT_DISABLE_STATS
stats.decrementBytes(sizeof(T) * count); stats.decrementBytes(sizeof(T) * count);
#endif #endif
// if (deletes.contains(p))
// {
// BLT_FATAL("pointer %p has already been freed", p);
// throw std::bad_alloc();
// }else
// deletes.insert(static_cast<void*>(p));
auto blk = to_block(p); auto blk = to_block(p);
if (--blk->metadata.allocated_objects == 0) blk->metadata.allocated_objects--;
if (blk->metadata.allocated_objects == 0)
{ {
//BLT_INFO("Deallocating block from %p in (1) %p current head %p, based: %p", p, blk, head, base);
if (blk == base) if (blk == base)
base = head = nullptr; {
if (blk->metadata.prev != nullptr) base = base->metadata.next;
// if they were equal (single allocated block) we also need to move the head forward
if (blk == head)
head = base;
} else if (blk == head) // else, need to make sure the head ptr gets moved back, otherwise we will use a head that has been freed
head = blk->metadata.prev;
else if (blk->metadata.prev != nullptr) // finally if it wasn't the head we need to bridge the gap in the list
blk->metadata.prev->metadata.next = blk->metadata.next; blk->metadata.prev->metadata.next = blk->metadata.next;
//BLT_INFO("Deallocating block from %p in (2) %p current head %p, based: %p", p, blk, head, base);
delete_block(blk); delete_block(blk);
} }
} }