fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-11-02 00:31:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Superrefactoring - all time values were replaced with new safer classes from uavcan/time.hpp; generated types were moved away from anonymous namespaces because this makes it impossible to use a type from different compilation units. Some less vital fixes are to follow - see the next few commits

Browse Source
This commit is contained in:
Pavel Kirienko
2014-03-11 14:41:48 +04:00
parent 633fa9d8bd
commit 65a4dcc2cf
48 changed files with 654 additions and 565 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libuavcan/test/internal/transport/outgoing_transfer_registry.cpp
+32 -31
View File
@@ -5,6 +5,7 @@
#include <algorithm>
#include <gtest/gtest.h>
#include <uavcan/internal/transport/outgoing_transfer_registry.hpp>
#include "../../clock.hpp"
TEST(OutgoingTransferRegistry, Basic)
@@ -13,7 +14,7 @@ TEST(OutgoingTransferRegistry, Basic)
uavcan::PoolManager<1> poolmgr; // Empty
uavcan::OutgoingTransferRegistry<4> otr(poolmgr);
otr.cleanup(1000);
otr.cleanup(tsMono(1000));
static const int NUM_KEYS = 5;
const OutgoingTransferRegistryKey keys[NUM_KEYS] =
@@ -25,50 +26,50 @@ TEST(OutgoingTransferRegistry, Basic)
OutgoingTransferRegistryKey(456, uavcan::TransferTypeServiceRequest, 2)
};
ASSERT_EQ(0, otr.accessOrCreate(keys[0], 1000000)->get());
ASSERT_EQ(0, otr.accessOrCreate(keys[1], 1000000)->get());
ASSERT_EQ(0, otr.accessOrCreate(keys[2], 1000000)->get());
ASSERT_EQ(0, otr.accessOrCreate(keys[3], 1000000)->get());
ASSERT_FALSE(otr.accessOrCreate(keys[4], 1000000)); // OOM
ASSERT_EQ(0, otr.accessOrCreate(keys[0], tsMono(1000000))->get());
ASSERT_EQ(0, otr.accessOrCreate(keys[1], tsMono(1000000))->get());
ASSERT_EQ(0, otr.accessOrCreate(keys[2], tsMono(1000000))->get());
ASSERT_EQ(0, otr.accessOrCreate(keys[3], tsMono(1000000))->get());
ASSERT_FALSE(otr.accessOrCreate(keys[4], tsMono(1000000))); // OOM
/*
* Incrementing a little
*/
otr.accessOrCreate(keys[0], 2000000)->increment();
otr.accessOrCreate(keys[0], 4000000)->increment();
otr.accessOrCreate(keys[0], 3000000)->increment();
ASSERT_EQ(3, otr.accessOrCreate(keys[0], 5000000)->get());
otr.accessOrCreate(keys[0], tsMono(2000000))->increment();
otr.accessOrCreate(keys[0], tsMono(4000000))->increment();
otr.accessOrCreate(keys[0], tsMono(3000000))->increment();
ASSERT_EQ(3, otr.accessOrCreate(keys[0], tsMono(5000000))->get());
otr.accessOrCreate(keys[2], 2000000)->increment();
otr.accessOrCreate(keys[2], 3000000)->increment();
ASSERT_EQ(2, otr.accessOrCreate(keys[2], 6000000)->get());
otr.accessOrCreate(keys[2], tsMono(2000000))->increment();
otr.accessOrCreate(keys[2], tsMono(3000000))->increment();
ASSERT_EQ(2, otr.accessOrCreate(keys[2], tsMono(6000000))->get());
otr.accessOrCreate(keys[3], 9000000)->increment();
ASSERT_EQ(1, otr.accessOrCreate(keys[3], 4000000)->get());
otr.accessOrCreate(keys[3], tsMono(9000000))->increment();
ASSERT_EQ(1, otr.accessOrCreate(keys[3], tsMono(4000000))->get());
ASSERT_EQ(0, otr.accessOrCreate(keys[1], 4000000)->get());
ASSERT_EQ(0, otr.accessOrCreate(keys[1], tsMono(4000000))->get());
ASSERT_FALSE(otr.accessOrCreate(keys[4], 1000000)); // Still OOM
ASSERT_FALSE(otr.accessOrCreate(keys[4], tsMono(1000000))); // Still OOM
/*
* Cleaning up
*/
otr.cleanup(4000001); // Kills 1, 3
ASSERT_EQ(0, otr.accessOrCreate(keys[1], 1000000)->get());
ASSERT_EQ(0, otr.accessOrCreate(keys[3], 1000000)->get());
otr.accessOrCreate(keys[1], 5000000)->increment();
otr.accessOrCreate(keys[3], 5000000)->increment();
otr.cleanup(tsMono(4000001)); // Kills 1, 3
ASSERT_EQ(0, otr.accessOrCreate(keys[1], tsMono(1000000))->get());
ASSERT_EQ(0, otr.accessOrCreate(keys[3], tsMono(1000000))->get());
otr.accessOrCreate(keys[1], tsMono(5000000))->increment();
otr.accessOrCreate(keys[3], tsMono(5000000))->increment();
ASSERT_EQ(3, otr.accessOrCreate(keys[0], 5000000)->get());
ASSERT_EQ(2, otr.accessOrCreate(keys[2], 6000000)->get());
ASSERT_EQ(3, otr.accessOrCreate(keys[0], tsMono(5000000))->get());
ASSERT_EQ(2, otr.accessOrCreate(keys[2], tsMono(6000000))->get());
otr.cleanup(5000001); // Kills 1, 3 (He needs a bath, Jud. He stinks of the ground you buried him in.), 0
ASSERT_EQ(0, otr.accessOrCreate(keys[0], 1000000)->get());
ASSERT_EQ(0, otr.accessOrCreate(keys[1], 1000000)->get());
ASSERT_EQ(0, otr.accessOrCreate(keys[3], 1000000)->get());
otr.cleanup(tsMono(5000001)); // Kills 1, 3 (He needs a bath, Jud. He stinks of the ground you buried him in.), 0
ASSERT_EQ(0, otr.accessOrCreate(keys[0], tsMono(1000000))->get());
ASSERT_EQ(0, otr.accessOrCreate(keys[1], tsMono(1000000))->get());
ASSERT_EQ(0, otr.accessOrCreate(keys[3], tsMono(1000000))->get());
ASSERT_EQ(2, otr.accessOrCreate(keys[2], 1000000)->get());
ASSERT_EQ(2, otr.accessOrCreate(keys[2], tsMono(1000000))->get());
otr.cleanup(5000001); // Frees some memory for 4
ASSERT_EQ(0, otr.accessOrCreate(keys[0], 1000000)->get());
otr.cleanup(tsMono(5000001)); // Frees some memory for 4
ASSERT_EQ(0, otr.accessOrCreate(keys[0], tsMono(1000000))->get());
}