Mirrors/bx
1
0
Fork 0
mirror of https://github.com/bkaradzic/bx.git synced 2026-02-17 20:52:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup.

Browse Source
This commit is contained in:
Бранимир Караџић
2019-02-14 20:34:56 -08:00
parent d168e4f213
commit 8397b518d6
1 changed files with 43 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
tests/nlalloc_test.cpp
View File

@@ -134,39 +134,32 @@ namespace bx
void free(const Blk& _blk)
{
BX_CHECK(isValid(_blk), "Freeing invalid block!");
m_used -= _blk.size;
m_free.push_back(_blk);
compact();
}
bool compact()
{
bx::quickSort(
m_free.begin()
, uint32_t(m_free.end() - m_free.begin() )
, sizeof(Blk)
, [](const void* _a, const void* _b) -> int32_t
{
const Blk& lhs = *(const Blk*)(_a);
const Blk& rhs = *(const Blk*)(_b);
return lhs < rhs ? -1 : 1;
});
for (FreeList::iterator it = m_free.begin(), next = it, itEnd = m_free.end(); next != itEnd;)
FreeList::iterator it = m_free.begin();
FreeList::iterator itEnd = m_free.end();
for (; it != itEnd; ++it)
{
if ( (it->ptr + it->size) == next->ptr)
if ( (_blk.ptr + _blk.size) == it->ptr)
{
it->size += next->size;
next = m_free.erase(next);
it->ptr = _blk.ptr;
it->size += _blk.size;
break;
}
else
if (_blk.ptr > it->ptr)
{
it = next;
++next;
m_free.insert(it, _blk);
break;
}
}
return 0 == m_used;
if (it == itEnd)
{
m_free.push_back(_blk);
}
}
uint32_t getUsed() const
@@ -192,9 +185,9 @@ TEST_CASE("nlalloc")
blk = nla.alloc(100);
REQUIRE(!isValid(blk) );
nla.add(bx::Blk{0x1000, 100});
nla.add(bx::Blk{0x1000, 1024});
blk = nla.alloc(100);
blk = nla.alloc(1024);
REQUIRE(isValid(blk) );
bx::Blk blk2 = nla.alloc(1);
@@ -203,6 +196,30 @@ TEST_CASE("nlalloc")
nla.free(blk);
REQUIRE(0 == nla.getUsed() );
{
bx::Blk blk3 = nla.alloc(123);
REQUIRE(isValid(blk3) );
bx::Blk blk4 = nla.alloc(134);
REQUIRE(isValid(blk4) );
bx::Blk blk5 = nla.alloc(145);
REQUIRE(isValid(blk5) );
bx::Blk blk6 = nla.alloc(156);
REQUIRE(isValid(blk6) );
bx::Blk blk7 = nla.alloc(167);
REQUIRE(isValid(blk7) );
nla.free(blk3);
nla.free(blk5);
nla.free(blk7);
nla.free(blk4);
nla.free(blk6);
REQUIRE(0 == nla.getUsed() );
}
blk2 = nla.alloc(1);
REQUIRE(isValid(blk2) );
REQUIRE(bx::NonLocalAllocator::kMinBlockSize == nla.getUsed() );