fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-17 00:53:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Allocator interface: getNumBlocks() --> getBlockCapacity()

Browse Source
This commit is contained in:
Pavel Kirienko
2015-10-16 14:31:42 +03:00
parent 913f6ea034
commit 660e84e17f
8 changed files with 43 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libuavcan/include/uavcan/dynamic_memory.hpp
+6 -3
View File
@@ -26,7 +26,10 @@ public:
virtual void* allocate(std::size_t size) = 0;
virtual void deallocate(const void* ptr) = 0;
virtual uint16_t getNumBlocks() const = 0;
/**
* Returns the maximum number of blocks this allocator can allocate.
*/
virtual uint16_t getBlockCapacity() const = 0;
};
/**
@@ -61,7 +64,7 @@ public:
virtual void* allocate(std::size_t size);
virtual void deallocate(const void* ptr);
virtual uint16_t getNumBlocks() const { return NumBlocks; }
virtual uint16_t getBlockCapacity() const { return NumBlocks; }
/**
* Return the number of blocks that are currently allocated/unallocated.
@@ -96,7 +99,7 @@ public:
virtual void* allocate(std::size_t size);
virtual void deallocate(const void* ptr);
virtual uint16_t getNumBlocks() const;
virtual uint16_t getBlockCapacity() const;
};
// ----------------------------------------------------------------------------
libuavcan/include/uavcan/helpers/heap_based_pool_allocator.hpp
+22 -6
View File
@@ -33,7 +33,9 @@ class UAVCAN_EXPORT HeapBasedPoolAllocator : public IPoolAllocator, Noncopyable
};
Node* volatile cache_;
uint16_t reported_num_blocks_;
const uint16_t capacity_soft_limit_;
const uint16_t capacity_hard_limit_;
Node* popCache()
{
@@ -58,10 +60,20 @@ class UAVCAN_EXPORT HeapBasedPoolAllocator : public IPoolAllocator, Noncopyable
public:
/**
* The allocator initializes with empty cache, so first allocations will be served from heap.
*
* @param block_capacity_soft_limit Block capacity that will be reported via @ref getBlockCapacity().
*
* @param block_capacity_hard_limit Real block capacity limit; the number of allocated blocks will never
* exceed this value. Hard limit should be higher than soft limit.
* Default value is two times the soft limit.
*/
HeapBasedPoolAllocator(uint16_t reported_num_blocks) :
HeapBasedPoolAllocator(uint16_t block_capacity_soft_limit,
uint16_t block_capacity_hard_limit = 0) :
cache_(NULL),
reported_num_blocks_(reported_num_blocks)
capacity_soft_limit_(block_capacity_soft_limit),
capacity_hard_limit_((block_capacity_hard_limit > 0) ? block_capacity_hard_limit :
static_cast<uint16_t>(min(static_cast<uint32_t>(block_capacity_soft_limit) * 2U,
static_cast<uint32_t>(NumericTraits<uint16_t>::max()))))
{ }
/**
@@ -103,10 +115,14 @@ public:
}
/**
* Heap-based pool is virutally infinite in size, so this method just returns some pre-defined value.
* The soft limit.
*/
virtual uint16_t getNumBlocks() const { return reported_num_blocks_; }
void setReportedNumBlocks(uint16_t x) { reported_num_blocks_ = x; }
virtual uint16_t getBlockCapacity() const { return capacity_soft_limit_; }
/**
* The hard limit.
*/
uint16_t getBlockCapacityHardLimit() const { return capacity_hard_limit_; }
/**
* Frees all blocks that are not in use at the moment.