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:
Branimir Karadžić
2018-10-24 18:44:43 -07:00
parent d3775b7283
commit 35404147e8
1 changed files with 14 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
tests/nlalloc_test.cpp
View File

@@ -28,38 +28,6 @@ struct TinyStlAllocator
#define TINYSTL_ALLOCATOR ::TinyStlAllocator
#include <tinystl/vector.h>
namespace tinystl
{
template<typename T, typename Alloc = TINYSTL_ALLOCATOR>
class list : public vector<T, Alloc>
{
public:
void push_front(const T& _value)
{
this->insert(this->begin(), _value);
}
void pop_front()
{
this->erase(this->begin() );
}
void sort()
{
bx::quickSort(
this->begin()
, uint32_t(this->end() - this->begin() )
, sizeof(T)
, [](const void* _a, const void* _b) -> int32_t {
const T& lhs = *(const T*)(_a);
const T& rhs = *(const T*)(_b);
return lhs < rhs ? -1 : 1;
});
}
};
} // namespace tinystl
namespace stl = tinystl;
namespace bx
@@ -124,8 +92,8 @@ namespace bx
if (0 < m_free.size() )
{
Blk freeBlock = m_free.front();
m_free.pop_front();
Blk freeBlock = m_free.back();
m_free.pop_back();
return freeBlock;
}
@@ -164,12 +132,21 @@ namespace bx
void free(const Blk& _blk)
{
m_used -= _blk.size;
m_free.push_front(_blk);
m_free.push_back(_blk);
compact();
}
bool compact()
{
m_free.sort();
bx::quickSort(
m_free.begin()
, uint32_t(m_free.end() - m_free.begin() )
, sizeof(T)
, [](const void* _a, const void* _b) -> int32_t {
const T& lhs = *(const T*)(_a);
const T& rhs = *(const T*)(_b);
return lhs < rhs ? -1 : 1;
});
for (FreeList::iterator it = m_free.begin(), next = it, itEnd = m_free.end(); next != itEnd;)
{
@@ -194,7 +171,7 @@ namespace bx
}
private:
typedef stl::list<Blk> FreeList;
typedef stl::vector<Blk> FreeList;
FreeList m_free;
uint32_t m_used;
};