fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-19 22:03:35 +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/test/dynamic_memory.cpp
+1 -1
View File
@@ -49,7 +49,7 @@ TEST(DynamicMemory, LimitedPoolAllocator)
uavcan::PoolAllocator<128, 32> pool32;
uavcan::LimitedPoolAllocator lim(pool32, 2);
EXPECT_EQ(2, lim.getNumBlocks());
EXPECT_EQ(2, lim.getBlockCapacity());
EXPECT_EQ(0, pool32.getPeakNumUsedBlocks());
const void* ptr1 = lim.allocate(1);
libuavcan/test/helpers/heap_based_pool_allocator.cpp
+7 -5
View File
@@ -12,13 +12,12 @@ TEST(HeapBasedPoolAllocator, Basic)
std::cout << ">>> HEAP BEFORE:" << std::endl;
malloc_stats();
uavcan::HeapBasedPoolAllocator<uavcan::MemPoolBlockSize> al(64);
uavcan::HeapBasedPoolAllocator<uavcan::MemPoolBlockSize> al(0xEEEE);
ASSERT_EQ(0, al.getNumCachedBlocks());
ASSERT_EQ(64, al.getNumBlocks());
al.setReportedNumBlocks(123);
ASSERT_EQ(123, al.getNumBlocks());
ASSERT_EQ(0xEEEE, al.getBlockCapacity());
ASSERT_EQ(0xFFFF, al.getBlockCapacityHardLimit());
void* a = al.allocate(10);
void* b = al.allocate(10);
@@ -74,7 +73,10 @@ TEST(HeapBasedPoolAllocator, Concurrency)
std::cout << ">>> HEAP BEFORE:" << std::endl;
malloc_stats();
uavcan::HeapBasedPoolAllocator<uavcan::MemPoolBlockSize, RaiiSynchronizer> al(1);
uavcan::HeapBasedPoolAllocator<uavcan::MemPoolBlockSize, RaiiSynchronizer> al(1000);
ASSERT_EQ(1000, al.getBlockCapacity());
ASSERT_EQ(2000, al.getBlockCapacityHardLimit());
volatile bool terminate = false;
libuavcan/test/transport/transfer_test_helpers.hpp
+1 -1
View File
@@ -316,5 +316,5 @@ class NullAllocator : public uavcan::IPoolAllocator
public:
virtual void* allocate(std::size_t) { return NULL; }
virtual void deallocate(const void*) { }
virtual uint16_t getNumBlocks() const { return 0; }
virtual uint16_t getBlockCapacity() const { return 0; }
};