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

Dynamic memory refactoring: Entire library now uses IPoolAllocator instead of IAllocator, which was removed completely. This change was needed to enable TX queue constraints, see the next commits.

Browse Source
This commit is contained in:
Pavel Kirienko
2014-04-12 17:17:06 +04:00
parent 5808bfc0c9
commit 4e7287358a
14 changed files with 120 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libuavcan/include/uavcan/map.hpp
+6 -6
View File
@@ -50,7 +50,7 @@ class UAVCAN_EXPORT MapBase : Noncopyable
IsDynamicallyAllocatable<KVGroup>::check();
}
static KVGroup* instantiate(IAllocator& allocator)
static KVGroup* instantiate(IPoolAllocator& allocator)
{
void* const praw = allocator.allocate(sizeof(KVGroup));
if (praw == NULL)
@@ -60,7 +60,7 @@ class UAVCAN_EXPORT MapBase : Noncopyable
return new (praw) KVGroup();
}
static void destroy(KVGroup*& obj, IAllocator& allocator)
static void destroy(KVGroup*& obj, IPoolAllocator& allocator)
{
if (obj != NULL)
{
@@ -85,7 +85,7 @@ class UAVCAN_EXPORT MapBase : Noncopyable
UAVCAN_PACKED_END
LinkedListRoot<KVGroup> list_;
IAllocator& allocator_;
IPoolAllocator& allocator_;
KVPair* const static_;
const unsigned num_static_entries_;
@@ -101,7 +101,7 @@ class UAVCAN_EXPORT MapBase : Noncopyable
};
protected:
MapBase(KVPair* static_buf, unsigned num_static_entries, IAllocator& allocator)
MapBase(KVPair* static_buf, unsigned num_static_entries, IPoolAllocator& allocator)
: allocator_(allocator)
, static_(static_buf)
, num_static_entries_(num_static_entries)
@@ -149,7 +149,7 @@ class UAVCAN_EXPORT Map : public MapBase<Key, Value>
typename MapBase<Key, Value>::KVPair static_[NumStaticEntries];
public:
Map(IAllocator& allocator)
Map(IPoolAllocator& allocator)
: MapBase<Key, Value>(static_, NumStaticEntries, allocator)
{ }
@@ -161,7 +161,7 @@ template <typename Key, typename Value>
class UAVCAN_EXPORT Map<Key, Value, 0> : public MapBase<Key, Value>
{
public:
Map(IAllocator& allocator)
Map(IPoolAllocator& allocator)
: MapBase<Key, Value>(NULL, 0, allocator)
{ }