DEV: update deque related containers
This commit is contained in:
parent
0a04a480f3
commit
1d03f37e67
@ -55,17 +55,22 @@ namespace tbx {
|
||||
* pushed or popped from the deque. If the criteria match we call call the callable of type
|
||||
* \c Fn
|
||||
*
|
||||
* \tparam Data_t The char-like queued item type. Usually \c char
|
||||
* \tparam N The size of edeque
|
||||
* \tparam Fn The type of Callable
|
||||
* \tparam Data_t The char-like queued item type. Usually \c char
|
||||
* \tparam N The size of edeque
|
||||
* \tparam SemiAtomic True for semi-atomic operation. In that case the \c ring_iterator is also atomic.
|
||||
* \tparam Fn The type of Callable
|
||||
* \note
|
||||
* SemiAtomic means it is safe to access different ends from different threads. For example one thread can
|
||||
* push only from front and another can pop from back to implement a queue.
|
||||
*/
|
||||
template <typename Data_t, size_t N, typename Fn = std::function<void()>>
|
||||
class edeque : public deque<Data_t, N> {
|
||||
template <typename Data_t, size_t N, bool SemiAtomic =false, typename Fn = std::function<void()>>
|
||||
class edeque : public deque<Data_t, N, SemiAtomic> {
|
||||
public:
|
||||
// meta-identity types
|
||||
using type = edeque<Data_t, N>;
|
||||
using base_type = deque<Data_t, N>;
|
||||
using type = edeque<Data_t, N, SemiAtomic, Fn>;
|
||||
using base_type = deque<Data_t, N, SemiAtomic>;
|
||||
using callable_t = Fn;
|
||||
using range_t = typename base_type::range_t;
|
||||
|
||||
// STL
|
||||
using value_type = typename base_type::value_type;
|
||||
@ -89,7 +94,11 @@ class edeque : public deque<Data_t, N> {
|
||||
enum class size_match { DISABLED =0, EQ, NE, LT, LE, GT, GE };
|
||||
//! \enum data_match
|
||||
//! The type of matching for data based match
|
||||
enum class data_match { DISABLED =0, MATCH, MISMATCH};
|
||||
enum class data_match { DISABLED =0, MATCH_PUSH, MATCH_POP, MISMATCH_PUSH, MISMATCH_POP};
|
||||
|
||||
// TODO: trigger mode for one-shot or repeated functionality
|
||||
// enum class trigger_mode { ONE_SHOT, REPEATED };
|
||||
|
||||
//! \struct size_trigger
|
||||
//! Size trigger data type
|
||||
struct size_trigger {
|
||||
@ -120,7 +129,7 @@ class edeque : public deque<Data_t, N> {
|
||||
constexpr edeque () noexcept :
|
||||
base_type() { }
|
||||
|
||||
//!
|
||||
//! Size trigger constructor
|
||||
constexpr edeque (size_match match, size_t size, callable_t&& fn) :
|
||||
base_type(),
|
||||
mode_{match_mode::SIZE},
|
||||
@ -128,7 +137,7 @@ class edeque : public deque<Data_t, N> {
|
||||
trigger_.tsize.type = match;
|
||||
trigger_.tsize.size = size;
|
||||
}
|
||||
|
||||
//! Data trigger constructor
|
||||
constexpr edeque (data_match match, Data_t value, callable_t&& fn) :
|
||||
base_type(),
|
||||
mode_{match_mode::DATA},
|
||||
@ -186,25 +195,25 @@ class edeque : public deque<Data_t, N> {
|
||||
//! @{
|
||||
void push_front (const Data_t& it) {
|
||||
base_type::push_front(it);
|
||||
check_trigger_async_(it);
|
||||
check_trigger_push_async_(it);
|
||||
}
|
||||
Data_t pop_front () {
|
||||
Data_t t = base_type::pop_front();
|
||||
check_trigger_async_(t);
|
||||
check_trigger_pop_async_(t);
|
||||
return t;
|
||||
}
|
||||
void push_back (const Data_t& it) {
|
||||
base_type::push_back(it);
|
||||
check_trigger_async_(it);
|
||||
check_trigger_push_async_(it);
|
||||
}
|
||||
Data_t pop_back () {
|
||||
Data_t t = base_type::pop_back();
|
||||
check_trigger_async_(t);
|
||||
check_trigger_pop_async_(t);
|
||||
return t;
|
||||
}
|
||||
//! @}
|
||||
|
||||
//! \name Public interface
|
||||
//! \name Private functionality
|
||||
//! @{
|
||||
private:
|
||||
//! \brief
|
||||
@ -230,28 +239,53 @@ class edeque : public deque<Data_t, N> {
|
||||
}
|
||||
|
||||
//! \brief
|
||||
//! Manually checks the data trigger and calls it we have match.
|
||||
//! Manually checks the data trigger on push and calls it we have match.
|
||||
//! \param it The item to check against
|
||||
//! \return True if the callable has called.
|
||||
bool check_trigger_value_ (const Data_t& it) {
|
||||
bool check_trigger_push_value_ (const Data_t& it) {
|
||||
bool match;
|
||||
switch (trigger_.tdata.type) {
|
||||
default:
|
||||
case data_match::DISABLED: match = false; break;
|
||||
case data_match::MATCH: match = (it == trigger_.tdata.value); break;
|
||||
case data_match::MISMATCH: match = (it != trigger_.tdata.value); break;
|
||||
case data_match::DISABLED: match = false; break;
|
||||
case data_match::MATCH_PUSH: match = (it == trigger_.tdata.value); break;
|
||||
case data_match::MISMATCH_PUSH: match = (it != trigger_.tdata.value); break;
|
||||
}
|
||||
if (match)
|
||||
callback_();
|
||||
return match;
|
||||
}
|
||||
|
||||
//! Wrapper for both triggers
|
||||
bool check_trigger_async_ (const Data_t& it) {
|
||||
//! \brief
|
||||
//! Manually checks the data trigger on pop and calls it we have match.
|
||||
//! \param it The item to check against
|
||||
//! \return True if the callable has called.
|
||||
bool check_trigger_pop_value_ (const Data_t& it) {
|
||||
bool match;
|
||||
switch (trigger_.tdata.type) {
|
||||
default:
|
||||
case data_match::DISABLED: match = false; break;
|
||||
case data_match::MATCH_POP: match = (it == trigger_.tdata.value); break;
|
||||
case data_match::MISMATCH_POP: match = (it != trigger_.tdata.value); break;
|
||||
}
|
||||
if (match)
|
||||
callback_();
|
||||
return match;
|
||||
}
|
||||
|
||||
//! Wrapper for both triggers at push
|
||||
bool check_trigger_push_async_ (const Data_t& it) {
|
||||
switch (mode_) {
|
||||
default:
|
||||
case match_mode::SIZE: return check_trigger_size_();
|
||||
case match_mode::DATA: return check_trigger_value_(it);
|
||||
case match_mode::DATA: return check_trigger_push_value_(it);
|
||||
}
|
||||
}
|
||||
//! Wrapper for both triggers at pop
|
||||
bool check_trigger_pop_async_ (const Data_t& it) {
|
||||
switch (mode_) {
|
||||
default:
|
||||
case match_mode::SIZE: return check_trigger_size_();
|
||||
case match_mode::DATA: return check_trigger_pop_value_(it);
|
||||
}
|
||||
}
|
||||
//! @}
|
||||
|
||||
@ -49,16 +49,20 @@ namespace tbx {
|
||||
*
|
||||
* We also provide stream operators.
|
||||
*
|
||||
* \tparam Data_t The char-like queued item type. Usually \c char
|
||||
* \tparam N The size of edeque
|
||||
* \tparam Fn The type of Callable
|
||||
* \tparam Data_t The char-like queued item type. Usually \c char
|
||||
* \tparam N The size of edeque
|
||||
* \tparam SemiAtomic True for semi-atomic operation. In that case the \c ring_iterator is also atomic.
|
||||
* \tparam Fn The type of Callable
|
||||
* \note
|
||||
* SemiAtomic means it is safe to for one thread to push only from front and another can pop.
|
||||
*/
|
||||
template <typename Data_t, size_t N, typename Fn = std::function<void()>>
|
||||
class equeue : public edeque<Data_t, N, Fn> {
|
||||
template <typename Data_t, size_t N, bool SemiAtomic =false, typename Fn = std::function<void()>>
|
||||
class equeue : public edeque<Data_t, N, SemiAtomic, Fn> {
|
||||
public:
|
||||
// meta-identity types
|
||||
using equeue_t = equeue<Data_t, N>;
|
||||
using base_type = edeque<Data_t, N, Fn>;
|
||||
using equeue_t = equeue<Data_t, N, SemiAtomic, Fn>;
|
||||
using base_type = edeque<Data_t, N, SemiAtomic, Fn>;
|
||||
using range_t = typename base_type::range_t;
|
||||
|
||||
// STL
|
||||
using value_type = typename base_type::value_type;
|
||||
@ -77,10 +81,7 @@ class equeue : public edeque<Data_t, N, Fn> {
|
||||
//! Default constructor
|
||||
constexpr equeue () noexcept : base_type() { }
|
||||
|
||||
//! fill contructor
|
||||
constexpr equeue(const Data_t& value) noexcept : base_type(value) { }
|
||||
|
||||
//! Initializer list contructor
|
||||
//! Forward constructor
|
||||
template <typename ...It>
|
||||
constexpr equeue(It&& ...it) noexcept : base_type(std::forward<It>(it)...) { }
|
||||
|
||||
@ -125,16 +126,17 @@ class equeue : public edeque<Data_t, N, Fn> {
|
||||
*
|
||||
* This definition enables the "data << equeue" syntax for pop operation
|
||||
*
|
||||
* \tparam Data_t The char-like queued item type. Usually \c char
|
||||
* \tparam N The size of queue
|
||||
* \tparam Fn The type of Callable
|
||||
* \tparam Data_t The char-like queued item type. Usually \c char
|
||||
* \tparam N The size of queue
|
||||
* \tparam SemiAtomic True for semi-atomic operation. In that case the \c ring_iterator is also atomic.
|
||||
* \tparam Fn The type of Callable
|
||||
*
|
||||
* \param it The item to write to
|
||||
* \param q The queue to read from
|
||||
* \return Reference to the returned item
|
||||
*/
|
||||
template <typename Data_t, size_t N, typename Fn = std::function<void()>>
|
||||
Data_t& operator<< (Data_t& it, equeue<Data_t, N, Fn>& q) {
|
||||
template <typename Data_t, size_t N, bool SemiAtomic =false, typename Fn = std::function<void()>>
|
||||
Data_t& operator<< (Data_t& it, equeue<Data_t, N, SemiAtomic, Fn>& q) {
|
||||
it = q.pop();
|
||||
return it;
|
||||
}
|
||||
|
||||
@ -48,15 +48,19 @@ namespace tbx {
|
||||
*
|
||||
* We also provide stream operators.
|
||||
*
|
||||
* \tparam Data_t The char-like queued item type. Usually \c char
|
||||
* \tparam N The size of queue
|
||||
* \tparam Data_t The char-like queued item type. Usually \c char
|
||||
* \tparam N The size of queue
|
||||
* \tparam SemiAtomic True for semi-atomic operation. In that case the \c ring_iterator is also atomic.
|
||||
* \note
|
||||
* SemiAtomic means it is safe to for one thread to push only from front and another can pop.
|
||||
*/
|
||||
template <typename Data_t, size_t N>
|
||||
class queue : public deque<Data_t, N> {
|
||||
template <typename Data_t, size_t N, bool SemiAtomic =false>
|
||||
class queue : public deque<Data_t, N, SemiAtomic> {
|
||||
public:
|
||||
// meta-identity types
|
||||
using queue_t = queue<Data_t, N>;
|
||||
using base_type = deque<Data_t, N>;
|
||||
using queue_t = queue<Data_t, N, SemiAtomic>;
|
||||
using base_type = deque<Data_t, N, SemiAtomic>;
|
||||
using range_t = typename base_type::range_t;
|
||||
|
||||
// STL
|
||||
using value_type = typename base_type::value_type;
|
||||
@ -121,15 +125,16 @@ class queue : public deque<Data_t, N> {
|
||||
*
|
||||
* This definition enables the "data << queue" syntax for pop operation
|
||||
*
|
||||
* \tparam Data_t The char-like queued item type. Usually \c char
|
||||
* \tparam N The size of queue
|
||||
* \tparam Data_t The char-like queued item type. Usually \c char
|
||||
* \tparam N The size of queue
|
||||
* \tparam SemiAtomic True for semi-atomic operation. In that case the \c ring_iterator is also atomic.
|
||||
*
|
||||
* \param it The item to write to
|
||||
* \param q The queue to read from
|
||||
* \return Reference to the returned item
|
||||
*/
|
||||
template <typename Data_t, size_t N>
|
||||
constexpr Data_t& operator<< (Data_t& it, queue<Data_t, N>& q) {
|
||||
template <typename Data_t, size_t N, bool SemiAtomic =false>
|
||||
constexpr Data_t& operator<< (Data_t& it, queue<Data_t, N, SemiAtomic>& q) {
|
||||
it = q.pop();
|
||||
return it;
|
||||
}
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
/*!
|
||||
* \file deque.cpp
|
||||
* \brief
|
||||
* Unit tests for deque
|
||||
* Unit tests for edeque
|
||||
*
|
||||
* \copyright Copyright (C) 2020 Christos Choutouridis <christos@choutouridis.net>
|
||||
*
|
||||
@ -33,7 +33,7 @@
|
||||
|
||||
#include <functional>
|
||||
|
||||
namespace Tdeque {
|
||||
namespace Tedeque {
|
||||
using namespace tbx;
|
||||
|
||||
int global_flag =0;
|
||||
@ -132,15 +132,15 @@ namespace Tdeque {
|
||||
e1.check_trigger(); // manual trigger attempt
|
||||
EXPECT_EQ (false, flag); // [SIZE triggers are auto clear]
|
||||
|
||||
Edeque e2(Edeque::data_match::MATCH, 42, [&](){ flag = true; });
|
||||
Edeque e2(Edeque::data_match::MATCH_PUSH, 42, [&](){ flag = true; });
|
||||
flag = false;
|
||||
e2.clear_trigger();
|
||||
EXPECT_EQ (false, flag);
|
||||
e2.push_back(42); // push 42, no-trigger cleared
|
||||
EXPECT_EQ (false, flag);
|
||||
e2.set_trigger(Edeque::data_match::MATCH, 42, [&](){ flag = true; });
|
||||
e2.set_trigger(Edeque::data_match::MATCH_PUSH, 42, [&](){ flag = true; });
|
||||
EXPECT_EQ (false, flag); // no spurious triggers
|
||||
e2.pop_back(); // pop 42, trigger
|
||||
e2.push_back(42); // push 42, trigger
|
||||
EXPECT_EQ (true, flag);
|
||||
|
||||
flag = false;
|
||||
@ -236,8 +236,8 @@ namespace Tdeque {
|
||||
using Edeque = edeque<int, 8>;
|
||||
bool flag{};
|
||||
|
||||
// data_match::MATCH (item == 42)
|
||||
Edeque ee(Edeque::data_match::MATCH, 42, [&](){ flag = true; });
|
||||
// data_match::MATCH_PUSH (item == 42)
|
||||
Edeque ee(Edeque::data_match::MATCH_PUSH, 42, [&](){ flag = true; });
|
||||
|
||||
flag = false;
|
||||
ee.push_back(7); // 7
|
||||
@ -246,14 +246,28 @@ namespace Tdeque {
|
||||
EXPECT_EQ (true, flag);
|
||||
|
||||
flag = false;
|
||||
ee.pop_back(); // pop:42, no-trigger
|
||||
EXPECT_EQ (false, flag);
|
||||
ee.push_back(42); // push:42, re-trigger
|
||||
EXPECT_EQ (true, flag);
|
||||
|
||||
// data_match::MATCH_POP (item == 42)
|
||||
flag = false;
|
||||
ee.clear_trigger();
|
||||
ee.set_trigger(Edeque::data_match::MATCH_POP, 42, [&](){ flag = true; });
|
||||
ee.push_back(7); // 7
|
||||
EXPECT_EQ (false, flag);
|
||||
ee.push_back(42); // push:42, no-trigger
|
||||
EXPECT_EQ (false, flag);
|
||||
ee.pop_back(); // pop:42, trigger
|
||||
EXPECT_EQ (true, flag);
|
||||
|
||||
// data_match::MATCH (item != 42)
|
||||
// data_match::MISMATCH_PUSH (item != 42)
|
||||
flag = false;
|
||||
ee.clear();
|
||||
ee.clear_trigger();
|
||||
ee.push_back(7); // 7
|
||||
ee.set_trigger(Edeque::data_match::MISMATCH, 42, [&](){ flag = true; });
|
||||
ee.set_trigger(Edeque::data_match::MISMATCH_PUSH, 42, [&](){ flag = true; });
|
||||
EXPECT_EQ (false, flag); // no spurious triggers
|
||||
ee.push_back(42); // 42, no-trigger
|
||||
EXPECT_EQ (false, flag);
|
||||
@ -263,5 +277,279 @@ namespace Tdeque {
|
||||
flag = false;
|
||||
ee.push_back(1); // 1, re-trigger
|
||||
EXPECT_EQ (true, flag);
|
||||
|
||||
// data_match::MISMATCH_POP (item != 42)
|
||||
flag = false;
|
||||
ee.clear();
|
||||
ee.clear_trigger();
|
||||
ee.push_back(7); // ->7
|
||||
ee.pop_back(); // <-7
|
||||
ee.set_trigger(Edeque::data_match::MISMATCH_POP, 42, [&](){ flag = true; });
|
||||
EXPECT_EQ (false, flag); // no spurious triggers
|
||||
ee.push_back(42); // ->42, no-trigger
|
||||
EXPECT_EQ (false, flag);
|
||||
ee.push_back(0); // ->0, no-trigger
|
||||
EXPECT_EQ (false, flag);
|
||||
ee.pop_back(); // pop:0, trigger
|
||||
EXPECT_EQ (true, flag);
|
||||
|
||||
flag = false;
|
||||
ee.push_back(0);
|
||||
ee.pop_back(); // pop:0, re-trigger
|
||||
EXPECT_EQ (true, flag);
|
||||
}
|
||||
|
||||
// atomic
|
||||
TEST (Tedeque, construct_atomic) {
|
||||
using Edeque = edeque<int, 8, true>;
|
||||
struct T { int a,b; };
|
||||
int local{};
|
||||
|
||||
Edeque e1(Edeque::size_match::GE, 3, [](){
|
||||
++global_flag;
|
||||
});
|
||||
Edeque e2(Edeque::size_match::GE, 3, [&](){
|
||||
++local;
|
||||
});
|
||||
Edeque e3(Edeque::size_match::EQ, 7, vfun);
|
||||
edeque<T, 8> e4(edeque<T, 8>::size_match::EQ, 2, vfoo{});
|
||||
|
||||
edeque<int, 8, true> q1;
|
||||
edeque<int, 8, true> q2(edeque<int, 8, true>::size_match::DISABLED, 0, nullptr);
|
||||
|
||||
EXPECT_EQ (8UL, e1.capacity());
|
||||
EXPECT_EQ (8UL, e2.capacity());
|
||||
EXPECT_EQ (8UL, e3.capacity());
|
||||
EXPECT_EQ (8UL, e4.capacity());
|
||||
|
||||
EXPECT_EQ (8UL, q1.capacity());
|
||||
EXPECT_EQ (8UL, q2.capacity());
|
||||
}
|
||||
|
||||
TEST (Tedeque, base_class_atomic) {
|
||||
using Edeque = edeque<int, 8, true>;
|
||||
|
||||
Edeque e1(Edeque::size_match::GE, 3, [](){
|
||||
++global_flag;
|
||||
});
|
||||
|
||||
// Access of base class functionality
|
||||
EXPECT_EQ (8UL, e1.capacity());
|
||||
EXPECT_EQ (0UL, e1.size());
|
||||
EXPECT_EQ (true, e1.empty());
|
||||
EXPECT_EQ (false, e1.full());
|
||||
|
||||
e1.push_back(7);
|
||||
EXPECT_EQ (7, e1.front());
|
||||
EXPECT_EQ (7, e1.back());
|
||||
EXPECT_EQ (7, e1.pop_front());
|
||||
|
||||
e1.push_front(42);
|
||||
EXPECT_EQ (42, e1.front());
|
||||
EXPECT_EQ (42, e1.back());
|
||||
EXPECT_EQ (42, e1.pop_back());
|
||||
|
||||
e1.push_back(1);
|
||||
e1.push_back(2);
|
||||
e1.push_back(3);
|
||||
|
||||
int check_it=1;
|
||||
for (auto it = e1.begin() ; it != e1.end() ; ++it)
|
||||
EXPECT_EQ(*it, check_it++);
|
||||
EXPECT_EQ(4, check_it); // run through all
|
||||
}
|
||||
|
||||
TEST (Tedeque, set_clear_check_trigger_atomic) {
|
||||
using Edeque = edeque<int, 8, true>;
|
||||
bool flag{};
|
||||
|
||||
Edeque e1(Edeque::size_match::GE, 1, [&](){ flag = true; });
|
||||
|
||||
flag = false;
|
||||
e1.clear_trigger();
|
||||
EXPECT_EQ (false, flag);
|
||||
e1.push_back(1); // 1, no-trigger cleared
|
||||
EXPECT_EQ (false, flag);
|
||||
|
||||
flag = false;
|
||||
e1.clear();
|
||||
e1.clear_trigger();
|
||||
EXPECT_EQ (false, flag); // no spurious triggers
|
||||
e1.push_back(1); // 1
|
||||
e1.push_back(2); // 2
|
||||
e1.set_trigger(Edeque::size_match::GE, 1, [&](){ flag = true; });
|
||||
EXPECT_EQ (false, flag); // no spurious triggers
|
||||
e1.check_trigger(); // manual trigger
|
||||
EXPECT_EQ (true, flag);
|
||||
|
||||
flag = false;
|
||||
e1.check_trigger(); // manual trigger attempt
|
||||
EXPECT_EQ (false, flag); // [SIZE triggers are auto clear]
|
||||
|
||||
Edeque e2(Edeque::data_match::MATCH_PUSH, 42, [&](){ flag = true; });
|
||||
flag = false;
|
||||
e2.clear_trigger();
|
||||
EXPECT_EQ (false, flag);
|
||||
e2.push_back(42); // push 42, no-trigger cleared
|
||||
EXPECT_EQ (false, flag);
|
||||
e2.set_trigger(Edeque::data_match::MATCH_PUSH, 42, [&](){ flag = true; });
|
||||
EXPECT_EQ (false, flag); // no spurious triggers
|
||||
e2.push_back(42); // push 42, trigger
|
||||
EXPECT_EQ (true, flag);
|
||||
|
||||
flag = false;
|
||||
e2.push_back(42); // push 42, re-trigger [DATA re-triggers]
|
||||
EXPECT_EQ (true, flag);
|
||||
}
|
||||
|
||||
TEST (Tedeque, size_triggers_atomic) {
|
||||
using Edeque = edeque<int, 8, true>;
|
||||
bool flag{};
|
||||
|
||||
// size_match::GE (size()>= 2)
|
||||
Edeque ee(Edeque::size_match::GE, 2, [&](){ flag = true; });
|
||||
|
||||
flag = false;
|
||||
ee.clear();
|
||||
ee.push_back(1); // 1
|
||||
EXPECT_EQ (false, flag);
|
||||
ee.push_back(2); // 2, trigger
|
||||
EXPECT_EQ (true, flag);
|
||||
flag = false;
|
||||
ee.push_back(3); // 3, no-trigger cleared
|
||||
EXPECT_EQ (false, flag);
|
||||
|
||||
// size_match::GT (size()> 1)
|
||||
flag = false;
|
||||
ee.clear();
|
||||
ee.set_trigger(Edeque::size_match::GT, 1, [&](){ flag = true; });
|
||||
ee.push_back(1); // 1
|
||||
EXPECT_EQ (false, flag);
|
||||
ee.push_back(2); // 2, trigger
|
||||
EXPECT_EQ (true, flag);
|
||||
flag = false;
|
||||
ee.push_back(3); // 3, no-trigger cleared
|
||||
EXPECT_EQ (false, flag);
|
||||
|
||||
// size_match::LE (size()<= 1)
|
||||
flag = false;
|
||||
ee.clear();
|
||||
ee.push_back(1); // 1
|
||||
ee.push_back(2); // 2
|
||||
ee.push_back(3); // 3
|
||||
ee.set_trigger(Edeque::size_match::LE, 1, [&](){ flag = true; });
|
||||
ee.pop_front(); // 2
|
||||
EXPECT_EQ (false, flag);
|
||||
ee.pop_front(); // 1, trigger
|
||||
EXPECT_EQ (true, flag);
|
||||
flag = false;
|
||||
ee.pop_front(); // 0, no-trigger cleared
|
||||
EXPECT_EQ (false, flag);
|
||||
|
||||
// size_match::LT (size()< 2)
|
||||
flag = false;
|
||||
ee.clear();
|
||||
ee.push_back(1); // 1
|
||||
ee.push_back(2); // 2
|
||||
ee.push_back(3); // 3
|
||||
ee.set_trigger(Edeque::size_match::LT, 2, [&](){ flag = true; });
|
||||
ee.pop_front(); // 2
|
||||
EXPECT_EQ (false, flag);
|
||||
ee.pop_front(); // 1, trigger
|
||||
EXPECT_EQ (true, flag);
|
||||
flag = false;
|
||||
ee.pop_front(); // 0, no-trigger cleared
|
||||
EXPECT_EQ (false, flag);
|
||||
|
||||
// size_match::EQ (size()== 2)
|
||||
flag = false;
|
||||
ee.clear();
|
||||
ee.set_trigger(Edeque::size_match::EQ, 2, [&](){ flag = true; });
|
||||
ee.push_back(1); // 1
|
||||
EXPECT_EQ (false, flag);
|
||||
ee.push_back(2); // 2, trigger
|
||||
EXPECT_EQ (true, flag);
|
||||
flag = false;
|
||||
ee.push_back(3); // 3
|
||||
ee.pop_front(); // 2, no-trigger cleared
|
||||
EXPECT_EQ (false, flag);
|
||||
|
||||
// size_match::NE (size()!= 0)
|
||||
flag = false;
|
||||
ee.clear();
|
||||
ee.set_trigger(Edeque::size_match::NE, 0, [&](){ flag = true; });
|
||||
EXPECT_EQ (false, flag);
|
||||
ee.push_back(1); // 1, trigger
|
||||
EXPECT_EQ (true, flag);
|
||||
flag = false;
|
||||
ee.push_back(2); // 2, no-trigger
|
||||
EXPECT_EQ (false, flag);
|
||||
}
|
||||
|
||||
TEST (Tedeque, data_triggers_atomic) {
|
||||
using Edeque = edeque<int, 8, true>;
|
||||
bool flag{};
|
||||
|
||||
// data_match::MATCH_PUSH (item == 42)
|
||||
Edeque ee(Edeque::data_match::MATCH_PUSH, 42, [&](){ flag = true; });
|
||||
|
||||
flag = false;
|
||||
ee.push_back(7); // 7
|
||||
EXPECT_EQ (false, flag);
|
||||
ee.push_back(42); // push:42, trigger
|
||||
EXPECT_EQ (true, flag);
|
||||
|
||||
flag = false;
|
||||
ee.pop_back(); // pop:42, no-trigger
|
||||
EXPECT_EQ (false, flag);
|
||||
ee.push_back(42); // push:42, re-trigger
|
||||
EXPECT_EQ (true, flag);
|
||||
|
||||
// data_match::MATCH_POP (item == 42)
|
||||
flag = false;
|
||||
ee.clear_trigger();
|
||||
ee.set_trigger(Edeque::data_match::MATCH_POP, 42, [&](){ flag = true; });
|
||||
ee.push_back(7); // 7
|
||||
EXPECT_EQ (false, flag);
|
||||
ee.push_back(42); // push:42, no-trigger
|
||||
EXPECT_EQ (false, flag);
|
||||
ee.pop_back(); // pop:42, trigger
|
||||
EXPECT_EQ (true, flag);
|
||||
|
||||
// data_match::MISMATCH_PUSH (item != 42)
|
||||
flag = false;
|
||||
ee.clear();
|
||||
ee.clear_trigger();
|
||||
ee.push_back(7); // 7
|
||||
ee.set_trigger(Edeque::data_match::MISMATCH_PUSH, 42, [&](){ flag = true; });
|
||||
EXPECT_EQ (false, flag); // no spurious triggers
|
||||
ee.push_back(42); // 42, no-trigger
|
||||
EXPECT_EQ (false, flag);
|
||||
ee.push_back(0); // 0, trigger
|
||||
EXPECT_EQ (true, flag);
|
||||
|
||||
flag = false;
|
||||
ee.push_back(1); // 1, re-trigger
|
||||
EXPECT_EQ (true, flag);
|
||||
|
||||
// data_match::MISMATCH_POP (item != 42)
|
||||
flag = false;
|
||||
ee.clear();
|
||||
ee.clear_trigger();
|
||||
ee.push_back(7); // ->7
|
||||
ee.pop_back(); // <-7
|
||||
ee.set_trigger(Edeque::data_match::MISMATCH_POP, 42, [&](){ flag = true; });
|
||||
EXPECT_EQ (false, flag); // no spurious triggers
|
||||
ee.push_back(42); // ->42, no-trigger
|
||||
EXPECT_EQ (false, flag);
|
||||
ee.push_back(0); // ->0, no-trigger
|
||||
EXPECT_EQ (false, flag);
|
||||
ee.pop_back(); // pop:0, trigger
|
||||
EXPECT_EQ (true, flag);
|
||||
|
||||
flag = false;
|
||||
ee.push_back(0);
|
||||
ee.pop_back(); // pop:0, re-trigger
|
||||
EXPECT_EQ (true, flag);
|
||||
}
|
||||
}
|
||||
|
||||
@ -128,15 +128,15 @@ namespace Tequeue {
|
||||
e1.check_trigger(); // manual trigger attempt
|
||||
EXPECT_EQ (false, flag); // [SIZE triggers are auto clear]
|
||||
|
||||
Equeue e2(Equeue::data_match::MATCH, 42, [&](){ flag = true; });
|
||||
Equeue e2(Equeue::data_match::MATCH_PUSH, 42, [&](){ flag = true; });
|
||||
flag = false;
|
||||
e2.clear_trigger();
|
||||
EXPECT_EQ (false, flag);
|
||||
e2.push_back(42); // push 42, no-trigger cleared
|
||||
EXPECT_EQ (false, flag);
|
||||
e2.set_trigger(Equeue::data_match::MATCH, 42, [&](){ flag = true; });
|
||||
e2.set_trigger(Equeue::data_match::MATCH_PUSH, 42, [&](){ flag = true; });
|
||||
EXPECT_EQ (false, flag); // no spurious triggers
|
||||
e2.pop_back(); // pop 42, trigger
|
||||
e2.push_back(42); // push 42, trigger
|
||||
EXPECT_EQ (true, flag);
|
||||
|
||||
flag = false;
|
||||
@ -178,4 +178,140 @@ namespace Tequeue {
|
||||
EXPECT_EQ (int{}, check_it);
|
||||
}
|
||||
|
||||
// atomic
|
||||
// Test construction
|
||||
TEST(Tequeue, contruct_atomic) {
|
||||
using Equeue = equeue<int, 8, true>;
|
||||
struct T { int a,b; };
|
||||
int local{};
|
||||
|
||||
Equeue e1(Equeue::size_match::GE, 3, [](){
|
||||
++global_flag;
|
||||
});
|
||||
Equeue e2(Equeue::size_match::GE, 3, [&](){
|
||||
++local;
|
||||
});
|
||||
Equeue e3(Equeue::size_match::EQ, 7, vfun);
|
||||
equeue<T, 8> e4(equeue<T, 8>::size_match::EQ, 2, vfoo{});
|
||||
|
||||
equeue<int, 8, true> q1;
|
||||
equeue<int, 8, true> q2(equeue<int, 8, true>::size_match::DISABLED, 0, nullptr);
|
||||
|
||||
EXPECT_EQ (8UL, e1.capacity());
|
||||
EXPECT_EQ (8UL, e2.capacity());
|
||||
EXPECT_EQ (8UL, e3.capacity());
|
||||
EXPECT_EQ (8UL, e4.capacity());
|
||||
|
||||
EXPECT_EQ (8UL, q1.capacity());
|
||||
EXPECT_EQ (8UL, q2.capacity());
|
||||
}
|
||||
|
||||
// simple push-pop functionality
|
||||
TEST(Tequeue, base_class_atomic) {
|
||||
using Equeue = equeue<int, 8, true>;
|
||||
|
||||
Equeue e1(Equeue::size_match::GE, 3, [](){
|
||||
++global_flag;
|
||||
});
|
||||
|
||||
// Access of base class functionality
|
||||
EXPECT_EQ (8UL, e1.capacity());
|
||||
EXPECT_EQ (0UL, e1.size());
|
||||
EXPECT_EQ (true, e1.empty());
|
||||
EXPECT_EQ (false, e1.full());
|
||||
|
||||
e1.push(42);
|
||||
EXPECT_EQ (42, e1.front());
|
||||
EXPECT_EQ (42, e1.back());
|
||||
EXPECT_EQ (42, e1.pop());
|
||||
|
||||
e1.push(1);
|
||||
e1.push(2);
|
||||
e1.push(3);
|
||||
|
||||
int check_it=1;
|
||||
for (auto it = e1.begin() ; it != e1.end() ; ++it)
|
||||
EXPECT_EQ(*it, check_it++);
|
||||
EXPECT_EQ(4, check_it); // run through all
|
||||
|
||||
}
|
||||
|
||||
// trigger functionality
|
||||
TEST (Tequeue, set_clear_check_trigger_atomic) {
|
||||
using Equeue = equeue<int, 8, true>;
|
||||
bool flag{};
|
||||
|
||||
Equeue e1(Equeue::size_match::GE, 1, [&](){ flag = true; });
|
||||
|
||||
flag = false;
|
||||
e1.clear_trigger();
|
||||
EXPECT_EQ (false, flag);
|
||||
e1.push_back(1); // 1, no-trigger cleared
|
||||
EXPECT_EQ (false, flag);
|
||||
|
||||
flag = false;
|
||||
e1.clear();
|
||||
e1.clear_trigger();
|
||||
EXPECT_EQ (false, flag); // no spurious triggers
|
||||
e1.push_back(1); // 1
|
||||
e1.push_back(2); // 2
|
||||
e1.set_trigger(Equeue::size_match::GE, 1, [&](){ flag = true; });
|
||||
EXPECT_EQ (false, flag); // no spurious triggers
|
||||
e1.check_trigger(); // manual trigger
|
||||
EXPECT_EQ (true, flag);
|
||||
|
||||
flag = false;
|
||||
e1.check_trigger(); // manual trigger attempt
|
||||
EXPECT_EQ (false, flag); // [SIZE triggers are auto clear]
|
||||
|
||||
Equeue e2(Equeue::data_match::MATCH_PUSH, 42, [&](){ flag = true; });
|
||||
flag = false;
|
||||
e2.clear_trigger();
|
||||
EXPECT_EQ (false, flag);
|
||||
e2.push_back(42); // push 42, no-trigger cleared
|
||||
EXPECT_EQ (false, flag);
|
||||
e2.set_trigger(Equeue::data_match::MATCH_PUSH, 42, [&](){ flag = true; });
|
||||
EXPECT_EQ (false, flag); // no spurious triggers
|
||||
e2.push_back(42); // push 42, trigger
|
||||
EXPECT_EQ (true, flag);
|
||||
|
||||
flag = false;
|
||||
e2.push_back(42); // push 42, re-trigger [DATA re-triggers]
|
||||
EXPECT_EQ (true, flag);
|
||||
}
|
||||
|
||||
// stream push-pop
|
||||
TEST(Tequeue, stream_push_pop_atomic) {
|
||||
equeue<int, 8, true> q1;
|
||||
|
||||
q1 << 1 << 2 << 3 << 4 << 5 << 6 << 7 << 8;
|
||||
EXPECT_EQ (8UL, q1.capacity());
|
||||
EXPECT_EQ (8UL, q1.size());
|
||||
EXPECT_EQ (false, q1.empty());
|
||||
EXPECT_EQ (true, q1.full());
|
||||
|
||||
q1 << 9; // try to insert in full queue
|
||||
EXPECT_EQ (8UL, q1.capacity());
|
||||
EXPECT_EQ (8UL, q1.size());
|
||||
EXPECT_EQ (false, q1.empty());
|
||||
EXPECT_EQ (true, q1.full());
|
||||
|
||||
int check_it=1;
|
||||
for (auto it = q1.begin() ; it != q1.end() ; ++it)
|
||||
EXPECT_EQ(*it, check_it++);
|
||||
EXPECT_EQ(9, check_it); // run through all
|
||||
|
||||
for (int i =1 ; i <= 8 ; ++i) {
|
||||
check_it << q1;
|
||||
EXPECT_EQ(i, check_it);
|
||||
}
|
||||
EXPECT_EQ (8UL, q1.capacity());
|
||||
EXPECT_EQ (0UL, q1.size());
|
||||
EXPECT_EQ (true, q1.empty());
|
||||
EXPECT_EQ (false, q1.full());
|
||||
|
||||
q1 >> check_it;
|
||||
EXPECT_EQ (int{}, check_it);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ -109,4 +109,80 @@ namespace Tqueue {
|
||||
EXPECT_EQ (int{}, check_it);
|
||||
}
|
||||
|
||||
|
||||
|
||||
// Test construction
|
||||
TEST(Tqueue, contruct_atomic) {
|
||||
queue<int, 8, true> q1;
|
||||
queue<int, 8, true> q2{1, 2, 3, 4, 5, 6, 7, 8};
|
||||
queue<int, 8, true> q3{1, 2, 3, 4, 5};
|
||||
|
||||
EXPECT_EQ (8UL, q1.capacity());
|
||||
EXPECT_EQ (0UL, q1.size());
|
||||
EXPECT_EQ (8UL, q2.capacity());
|
||||
EXPECT_EQ (8UL, q2.size());
|
||||
EXPECT_EQ (8UL, q3.capacity());
|
||||
EXPECT_EQ (5UL, q3.size());
|
||||
}
|
||||
|
||||
// base class functionality check
|
||||
TEST(Tqueue, base_class_atomic) {
|
||||
|
||||
queue<int, 8, true> q1;
|
||||
|
||||
// Access of base class functionality
|
||||
EXPECT_EQ (8UL, q1.capacity());
|
||||
EXPECT_EQ (0UL, q1.size());
|
||||
EXPECT_EQ (true, q1.empty());
|
||||
EXPECT_EQ (false, q1.full());
|
||||
|
||||
q1.push(42);
|
||||
EXPECT_EQ (42, q1.front());
|
||||
EXPECT_EQ (42, q1.back());
|
||||
EXPECT_EQ (42, q1.pop());
|
||||
|
||||
q1.push(1);
|
||||
q1.push(2);
|
||||
q1.push(3);
|
||||
|
||||
int check_it=1;
|
||||
for (auto it = q1.begin() ; it != q1.end() ; ++it)
|
||||
EXPECT_EQ(*it, check_it++);
|
||||
EXPECT_EQ(4, check_it); // run through all
|
||||
}
|
||||
|
||||
// stream push-pop
|
||||
TEST(Tqueue, stream_push_pop_atomic) {
|
||||
queue<int, 8, true> q1;
|
||||
|
||||
q1 << 1 << 2 << 3 << 4 << 5 << 6 << 7 << 8;
|
||||
EXPECT_EQ (8UL, q1.capacity());
|
||||
EXPECT_EQ (8UL, q1.size());
|
||||
EXPECT_EQ (false, q1.empty());
|
||||
EXPECT_EQ (true, q1.full());
|
||||
|
||||
q1 << 9; // try to insert in full queue
|
||||
EXPECT_EQ (8UL, q1.capacity());
|
||||
EXPECT_EQ (8UL, q1.size());
|
||||
EXPECT_EQ (false, q1.empty());
|
||||
EXPECT_EQ (true, q1.full());
|
||||
|
||||
int check_it=1;
|
||||
for (auto it = q1.begin() ; it != q1.end() ; ++it)
|
||||
EXPECT_EQ(*it, check_it++);
|
||||
EXPECT_EQ(9, check_it); // run through all
|
||||
|
||||
for (int i =1 ; i <= 8 ; ++i) {
|
||||
check_it << q1;
|
||||
EXPECT_EQ(i, check_it);
|
||||
}
|
||||
EXPECT_EQ (8UL, q1.capacity());
|
||||
EXPECT_EQ (0UL, q1.size());
|
||||
EXPECT_EQ (true, q1.empty());
|
||||
EXPECT_EQ (false, q1.full());
|
||||
|
||||
q1 >> check_it;
|
||||
EXPECT_EQ (int{}, check_it);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user