diff --git a/containers_cpp/include/embb/containers/blocking_stack.h b/containers_cpp/include/embb/containers/blocking_stack.h new file mode 100755 index 0000000..c37ef34 --- /dev/null +++ b/containers_cpp/include/embb/containers/blocking_stack.h @@ -0,0 +1,88 @@ + /* + * Copyright (c) 2014-2015, 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 EMBB_CONTAINERS_BLOCKING_STACK_H_ +#define EMBB_CONTAINERS_BLOCKING_STACK_H_ + +#include + +#include + +namespace embb { +namespace containers { + +/** +* Wrapper for the standard library stack. +* +* \tparam T Element type +*/ +template< typename Type> +class BlockingStack : public BlockingContainer { + private: + /** + * Internal stack from the standard library. + */ + std::stack internalStack; + public: + /** + * Enstacks an element in the internal stack. + */ + void Push( + const Type& element + /**< [IN] Constant reference to element to push*/); + + void Pop( + Type& element + /**< [IN] Reference to popped element*/); + + protected: + /* + * Wrapper for the push method in the standard stack. + */ + virtual void SpecializedPush( + const Type& element + /**< [IN] Constant reference to element to push.*/); + + /** + * Wrapper for the pop method in the standard stack. + */ + virtual void SpecializedPop( + Type& element + /**< [IN,OUT] Reference to element to the popped element*/); + + /** + * Wrapper for the empty method in the standard stack. + */ + virtual bool IsEmpty(); + +}; + +} // namespace containers +} // namespace embb + +#include + +#endif // EMBB_CONTAINERS_BLOCKING_STACK_H_ \ No newline at end of file diff --git a/containers_cpp/include/embb/containers/internal/blocking_stack-inl.h b/containers_cpp/include/embb/containers/internal/blocking_stack-inl.h new file mode 100755 index 0000000..8e69445 --- /dev/null +++ b/containers_cpp/include/embb/containers/internal/blocking_stack-inl.h @@ -0,0 +1,64 @@ +#include "..\blocking_stack.h" +/* + * Copyright (c) 2014-2015, 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 EMBB_CONTAINERS_INTERNAL_BLOCKING_STACK_INL_H_ +#define EMBB_CONTAINERS_INTERNAL_BLOCKING_STACK_INL_H_ + + +namespace embb { +namespace containers { + +template +void BlockingStack::SpecializedPush(const T& element) { + internalStack.push(element); +} + +template +void BlockingStack::SpecializedPop(T& element) { + element = internalStack.top(); + internalStack.pop(); +} + +template +bool BlockingStack::IsEmpty() { + return internalStack.empty(); +} + +template +void BlockingStack::Push(const T& element) { + PushAndWakeUp(element); +} + +template +void BlockingStack::Pop(T& element) { + BlockingPop(element); +} + +} // namespace containers +} // namespace embb + +#endif // EMBB_CONTAINERS_INTERNAL_BLOCKING_STACK_INL_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 4f6f224..85c8561 100644 --- a/containers_cpp/test/main.cc +++ b/containers_cpp/test/main.cc @@ -29,6 +29,7 @@ #include #include #include +#include #include #include #include @@ -40,6 +41,7 @@ #include "./queue_test.h" #include "./blocking_queue_test.h" #include "./stack_test.h" +#include "./blocking_stack_test.h" #include "./hazard_pointer_test.h" #include "./object_pool_test.h" @@ -51,6 +53,7 @@ using embb::containers::WaitFreeSPSCQueue; using embb::containers::LockFreeMPMCQueue; using embb::containers::BlockingQueue; using embb::containers::LockFreeStack; +using embb::containers::BlockingStack; using embb::containers::LockFreeTreeValuePool; using embb::containers::WaitFreeArrayValuePool; using embb::containers::test::PoolTest; @@ -58,6 +61,7 @@ using embb::containers::test::HazardPointerTest; using embb::containers::test::QueueTest; using embb::containers::test::BlockingQueueTest; using embb::containers::test::StackTest; +using embb::containers::test::BlockingStackTest; using embb::containers::test::ObjectPoolTest; using embb::containers::test::HazardPointerTest2; @@ -75,6 +79,7 @@ PT_MAIN("Data Structures C++") { COMMA true COMMA true >); PT_RUN(BlockingQueueTest< BlockingQueue >); PT_RUN(StackTest< LockFreeStack >); + PT_RUN(BlockingStackTest< BlockingStack >); PT_RUN(ObjectPoolTest< LockFreeTreeValuePool >); PT_RUN(ObjectPoolTest< WaitFreeArrayValuePool >);