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

Map<>::insert() --> Value*, saves one lookup for TransferListener::handleFrame()

Browse Source
This commit is contained in:
Pavel Kirienko
2014-02-11 19:11:36 +04:00
parent 445ec8173c
commit 4c1a4a32c7
2 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libuavcan/test/map.cpp
+10 -6
View File
@@ -43,17 +43,17 @@ TEST(Map, Basic)
ASSERT_EQ(0, pool.getNumUsedBlocks());
// Static insertion
ASSERT_TRUE(map->insert("1", "a"));
ASSERT_TRUE(map->insert("2", "b"));
ASSERT_EQ("a", *map->insert("1", "a"));
ASSERT_EQ("b", *map->insert("2", "b"));
ASSERT_EQ(0, pool.getNumUsedBlocks());
ASSERT_EQ(2, map->getNumStaticPairs());
ASSERT_EQ(0, map->getNumDynamicPairs());
// Dynamic insertion
ASSERT_TRUE(map->insert("3", "c"));
ASSERT_EQ("c", *map->insert("3", "c"));
ASSERT_EQ(1, pool.getNumUsedBlocks());
ASSERT_TRUE(map->insert("4", "d"));
ASSERT_EQ("d", *map->insert("4", "d"));
ASSERT_EQ(1, pool.getNumUsedBlocks()); // Assuming that at least 2 items fit one block
ASSERT_EQ(2, map->getNumStaticPairs());
ASSERT_EQ(2, map->getNumDynamicPairs());
@@ -104,12 +104,16 @@ TEST(Map, Basic)
{
const std::string key = toString(i);
const std::string value = toString(i);
const bool res = map->insert(key, value); // Will override some from the above
if (!res)
std::string* res = map->insert(key, value); // Will override some from the above
if (res == NULL)
{
ASSERT_LT(2, i);
break;
}
else
{
ASSERT_EQ(value, *res);
}
max_key_integer = i;
}
std::cout << "Max key/value: " << max_key_integer << std::endl;