From d9a6be5da61ec98fa8ff16511f059f1ef26e56fc Mon Sep 17 00:00:00 2001 From: lucapegolotti Date: Fri, 15 Apr 2016 14:44:24 +0200 Subject: [PATCH] containers_cpp: added tests on blocking queue + minor problems fixes in blocking container tests --- containers_cpp/test/blocking_container_test-inl.h | 2 +- containers_cpp/test/blocking_container_test.h | 11 +++++------ containers_cpp/test/blocking_queue_test-inl.h | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ containers_cpp/test/blocking_queue_test.h | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ containers_cpp/test/main.cc | 5 +++++ 5 files changed, 112 insertions(+), 7 deletions(-) create mode 100755 containers_cpp/test/blocking_queue_test-inl.h create mode 100755 containers_cpp/test/blocking_queue_test.h diff --git a/containers_cpp/test/blocking_container_test-inl.h b/containers_cpp/test/blocking_container_test-inl.h index b647988..61543d7 100755 --- a/containers_cpp/test/blocking_container_test-inl.h +++ b/containers_cpp/test/blocking_container_test-inl.h @@ -104,7 +104,7 @@ void BlockingContainerTest::BlockingContainerTest1_ThreadMethod() { for (std::vector::iterator it = my_elements.begin(); it != my_elements.end(); ++it) { - SpecializezdPush(*it); + SpecializedPush(*it); } my_elements.clear(); diff --git a/containers_cpp/test/blocking_container_test.h b/containers_cpp/test/blocking_container_test.h index 2750e54..624bc62 100755 --- a/containers_cpp/test/blocking_container_test.h +++ b/containers_cpp/test/blocking_container_test.h @@ -35,7 +35,7 @@ namespace containers { namespace test { template class BlockingContainerTest : public partest::TestCase { - private: + protected: int n_threads; int n_iterations; int n_container_elements_per_thread; @@ -44,6 +44,10 @@ class BlockingContainerTest : public partest::TestCase { std::vector expected_container_elements; std::vector* thread_local_vectors; + virtual void SpecializedPush(const int& element) = 0; + + virtual void SpecializedPop(int& element) = 0; + public: BlockingContainerTest(); @@ -53,11 +57,6 @@ class BlockingContainerTest : public partest::TestCase { void BlockingContainerTest1_ThreadMethod(); - protected: - - virtual void SpecializedPush(const int& element) = 0; - - virtual void SpecializedPop(int& element) = 0; }; } // namespace test } // namespace containers diff --git a/containers_cpp/test/blocking_queue_test-inl.h b/containers_cpp/test/blocking_queue_test-inl.h new file mode 100755 index 0000000..1dbccd5 --- /dev/null +++ b/containers_cpp/test/blocking_queue_test-inl.h @@ -0,0 +1,51 @@ +/* + * Copyright (c) 2014-2016, Siemens AG. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef CONTAINERS_CPP_TEST_BLOCKING_QUEUE_TEST_INL_H_ +#define CONTAINERS_CPP_TEST_BLOCKING_QUEUE_TEST_INL_H_ + +#include +#include + +namespace embb { +namespace containers { +namespace test { + +template +void BlockingQueueTest::SpecializedPush(const int& element){ + container.Enqueue(element); +} + +template +void BlockingQueueTest::SpecializedPop(int& element){ + container.Dequeue(element); +} + +} // namespace test +} // namespace containers +} // namespace embb + +#endif // CONTAINERS_CPP_TEST_BLOCKING_QUEUE_TEST_INL_H_ diff --git a/containers_cpp/test/blocking_queue_test.h b/containers_cpp/test/blocking_queue_test.h new file mode 100755 index 0000000..6bc773f --- /dev/null +++ b/containers_cpp/test/blocking_queue_test.h @@ -0,0 +1,50 @@ +/* + * Copyright (c) 2014-2016, Siemens AG. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ +#ifndef CONTAINERS_CPP_TEST_BLOCKING_QUEUE_TEST_H_ +#define CONTAINERS_CPP_TEST_BLOCKING_QUEUE_TEST_H_ + +#include +#include +#include +#include <./blocking_container_test.h> + +namespace embb { +namespace containers { +namespace test { +template +class BlockingQueueTest : public BlockingContainerTest { + protected: + virtual void SpecializedPush(const int& element); + + virtual void SpecializedPop(int& element); +}; +} // namespace test +} // namespace containers +} // namespace embb + +#include "./blocking_queue_test-inl.h" + +#endif // CONTAINERS_CPP_TEST_BLOCKING_QUEUE_TEST_H_ diff --git a/containers_cpp/test/main.cc b/containers_cpp/test/main.cc index d21dede..4f6f224 100644 --- a/containers_cpp/test/main.cc +++ b/containers_cpp/test/main.cc @@ -30,6 +30,7 @@ #include #include #include +#include #include #include @@ -37,6 +38,7 @@ #include "./pool_test.h" #include "./queue_test.h" +#include "./blocking_queue_test.h" #include "./stack_test.h" #include "./hazard_pointer_test.h" #include "./object_pool_test.h" @@ -47,12 +49,14 @@ using embb::containers::WaitFreeArrayValuePool; using embb::containers::LockFreeTreeValuePool; using embb::containers::WaitFreeSPSCQueue; using embb::containers::LockFreeMPMCQueue; +using embb::containers::BlockingQueue; using embb::containers::LockFreeStack; using embb::containers::LockFreeTreeValuePool; using embb::containers::WaitFreeArrayValuePool; using embb::containers::test::PoolTest; using embb::containers::test::HazardPointerTest; using embb::containers::test::QueueTest; +using embb::containers::test::BlockingQueueTest; using embb::containers::test::StackTest; using embb::containers::test::ObjectPoolTest; using embb::containers::test::HazardPointerTest2; @@ -69,6 +73,7 @@ PT_MAIN("Data Structures C++") { PT_RUN(QueueTest< WaitFreeSPSCQueue< ::std::pair > >); PT_RUN(QueueTest< LockFreeMPMCQueue< ::std::pair > COMMA true COMMA true >); + PT_RUN(BlockingQueueTest< BlockingQueue >); PT_RUN(StackTest< LockFreeStack >); PT_RUN(ObjectPoolTest< LockFreeTreeValuePool >); PT_RUN(ObjectPoolTest< WaitFreeArrayValuePool >); -- libgit2 0.26.0