Heap based pool allocator - configurable getNumBlocks()

This commit is contained in:
Pavel Kirienko 2015-10-15 10:50:42 +03:00
parent edadf58a91
commit ef93f1b1e8
2 changed files with 14 additions and 5 deletions

View File

@ -49,6 +49,7 @@ class UAVCAN_EXPORT HeapBasedPoolAllocator : public IPoolAllocator, Noncopyable
};
Node* volatile cache_;
uint16_t reported_num_blocks_;
Node* popCache()
{
@ -73,7 +74,10 @@ public:
/**
* The allocator initializes with empty cache, so first allocations will be served from heap.
*/
HeapBasedPoolAllocator() : cache_(NULL) { }
HeapBasedPoolAllocator(uint16_t reported_num_blocks) :
cache_(NULL),
reported_num_blocks_(reported_num_blocks)
{ }
/**
* The destructor de-allocates all blocks that are currently in the cache.
@ -121,9 +125,10 @@ public:
}
/**
* Heap-based pool is virutally infinite in size, so this method just returns maximum possible number of blocks.
* Heap-based pool is virutally infinite in size, so this method just returns some pre-defined value.
*/
virtual uint16_t getNumBlocks() const { return NumericTraits<uint16_t>::max(); }
virtual uint16_t getNumBlocks() const { return reported_num_blocks_; }
void setReportedNumBlocks(uint16_t x) { reported_num_blocks_ = x; }
/**
* Frees all blocks that are not in use at the moment.

View File

@ -16,10 +16,14 @@ TEST(HeapBasedPoolAllocator, Basic)
std::cout << ">>> HEAP BEFORE:" << std::endl;
malloc_stats();
uavcan::HeapBasedPoolAllocator<uavcan::MemPoolBlockSize, atomicCompareAndSwap> al;
uavcan::HeapBasedPoolAllocator<uavcan::MemPoolBlockSize, atomicCompareAndSwap> al(64);
ASSERT_EQ(0, al.getNumCachedBlocks());
ASSERT_EQ(64, al.getNumBlocks());
al.setReportedNumBlocks(123);
ASSERT_EQ(123, al.getNumBlocks());
void* a = al.allocate(10);
void* b = al.allocate(10);
void* c = al.allocate(10);
@ -77,7 +81,7 @@ TEST(HeapBasedPoolAllocator, Concurrency)
std::cout << ">>> HEAP BEFORE:" << std::endl;
malloc_stats();
uavcan::HeapBasedPoolAllocator<uavcan::MemPoolBlockSize, atomicCompareAndSwapWithRescheduling> al;
uavcan::HeapBasedPoolAllocator<uavcan::MemPoolBlockSize, atomicCompareAndSwapWithRescheduling> al(1);
volatile bool terminate = false;