From ad5d2ef1d9016632870bccac3b9d955c05bb3617 Mon Sep 17 00:00:00 2001 From: lucapegolotti Date: Fri, 15 Apr 2016 15:23:11 +0200 Subject: [PATCH] containers_cpp: add tests for blocking stack --- containers_cpp/test/blocking_container_test-inl.h | 1 - containers_cpp/test/blocking_stack_test-inl.h | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++ containers_cpp/test/blocking_stack_test.h | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ containers_cpp/test/main.cc | 5 +++++ 4 files changed, 107 insertions(+), 1 deletion(-) create mode 100755 containers_cpp/test/blocking_stack_test-inl.h create mode 100755 containers_cpp/test/blocking_stack_test.h diff --git a/containers_cpp/test/blocking_container_test-inl.h b/containers_cpp/test/blocking_container_test-inl.h index 61543d7..be94a3e 100755 --- a/containers_cpp/test/blocking_container_test-inl.h +++ b/containers_cpp/test/blocking_container_test-inl.h @@ -41,7 +41,6 @@ n_threads(static_cast n_container_elements_per_thread(100), n_container_elements(n_container_elements_per_thread*n_threads), container(){ - std::cout << "num thread = " << n_threads << std::endl; CreateUnit("BlockingContainerTestThreadsPushAndPopToGlobalBlockingContainer"). Pre(&BlockingContainerTest::BlockingContainerTest1_Pre, this). Add(&BlockingContainerTest::BlockingContainerTest1_ThreadMethod, this, diff --git a/containers_cpp/test/blocking_stack_test-inl.h b/containers_cpp/test/blocking_stack_test-inl.h new file mode 100755 index 0000000..c6ab0a3 --- /dev/null +++ b/containers_cpp/test/blocking_stack_test-inl.h @@ -0,0 +1,52 @@ +/* + * 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_STACK_TEST_INL_H_ +#define CONTAINERS_CPP_TEST_BLOCKING_STACK_TEST_INL_H_ + +#include +#include + +namespace embb { +namespace containers { +namespace test { + +template +void BlockingStackTest::SpecializedPush(const int& element) { + container.Push(element); +} + +template +void BlockingStackTest::SpecializedPop(int& element) { + container.Pop(element); +} + + +} // namespace test +} // namespace containers +} // namespace embb + +#endif // CONTAINERS_CPP_TEST_BLOCKING_STACK_TEST_INL_H_ diff --git a/containers_cpp/test/blocking_stack_test.h b/containers_cpp/test/blocking_stack_test.h new file mode 100755 index 0000000..3eb140d --- /dev/null +++ b/containers_cpp/test/blocking_stack_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_STACK_TEST_H_ +#define CONTAINERS_CPP_TEST_BLOCKING_STACK_TEST_H_ + +#include +#include +#include +#include <./blocking_container_test.h> + +namespace embb { +namespace containers { +namespace test { +template +class BlockingStackTest : public BlockingContainerTest { + protected: + virtual void SpecializedPush(const int& element); + + virtual void SpecializedPop(int& element); +}; +} // namespace test +} // namespace stacks +} // namespace embb + +#include "./blocking_stack_test-inl.h" + +#endif // CONTAINERS_CPP_TEST_BLOCKING_STACK_TEST_H_ diff --git a/containers_cpp/test/main.cc b/containers_cpp/test/main.cc index d21dede..81d495c 100644 --- a/containers_cpp/test/main.cc +++ b/containers_cpp/test/main.cc @@ -29,6 +29,7 @@ #include #include #include +#include #include #include @@ -38,6 +39,7 @@ #include "./pool_test.h" #include "./queue_test.h" #include "./stack_test.h" +#include "./blocking_stack_test.h" #include "./hazard_pointer_test.h" #include "./object_pool_test.h" @@ -48,12 +50,14 @@ using embb::containers::LockFreeTreeValuePool; using embb::containers::WaitFreeSPSCQueue; using embb::containers::LockFreeMPMCQueue; using embb::containers::LockFreeStack; +using embb::containers::BlockingStack; 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::StackTest; +using embb::containers::test::BlockingStackTest; using embb::containers::test::ObjectPoolTest; using embb::containers::test::HazardPointerTest2; @@ -70,6 +74,7 @@ PT_MAIN("Data Structures C++") { PT_RUN(QueueTest< LockFreeMPMCQueue< ::std::pair > COMMA true COMMA true >); PT_RUN(StackTest< LockFreeStack >); + PT_RUN(BlockingStackTest< BlockingStack >); PT_RUN(ObjectPoolTest< LockFreeTreeValuePool >); PT_RUN(ObjectPoolTest< WaitFreeArrayValuePool >); -- libgit2 0.26.0