Merge branch 'embb556_blocking_stack' into embb499_blocking_data_structures

containers_cpp/include/embb/containers/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_BLOCKING_STACK_H_
+#define EMBB_CONTAINERS_BLOCKING_STACK_H_
+
+#include <stack>
+
+#include <embb/containers/blocking_container.h>
+
+namespace embb {
+namespace containers {
+
+/**
+* Wrapper for the standard library stack.
+*
+* \tparam T Element type
+*/
+template< typename Type>
+class BlockingStack : public BlockingContainer<Type> {
+ private:
+  /**
+  * Internal stack from the standard library.
+  */
+  std::stack<Type> 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 <embb/containers/internal/blocking_stack-inl.h>
+
+#endif  // EMBB_CONTAINERS_BLOCKING_STACK_H_
\ No newline at end of file

containers_cpp/include/embb/containers/internal/blocking_stack-inl.h

+#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 <typename T>
+void BlockingStack<T>::SpecializedPush(const T& element) {
+  internalStack.push(element);
+}
+
+template <typename T>
+void BlockingStack<T>::SpecializedPop(T& element) {
+  element = internalStack.top();
+  internalStack.pop();
+}
+
+template <typename T>
+bool BlockingStack<T>::IsEmpty() {
+  return internalStack.empty();
+}
+
+template <typename T>
+void BlockingStack<T>::Push(const T& element) {
+  PushAndWakeUp(element);
+}
+
+template <typename T>
+void BlockingStack<T>::Pop(T& element) {
+  BlockingPop(element);
+}
+
+}  // namespace containers
+}  // namespace embb
+
+#endif  // EMBB_CONTAINERS_INTERNAL_BLOCKING_STACK_INL_H_

containers_cpp/test/blocking_container_test-inl.h

@@ -41,7 +41,6 @@ n_threads(static_cast<int>
   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,

containers_cpp/test/blocking_stack_test-inl.h

+/*
+ * 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 <vector>
+#include <algorithm>
+
+namespace embb {
+namespace containers {
+namespace test {
+
+template<typename Stack_t>
+void BlockingStackTest<Stack_t>::SpecializedPush(const int& element) {
+  container.Push(element);
+}
+
+template<typename Stack_t>
+void BlockingStackTest<Stack_t>::SpecializedPop(int& element) {
+  container.Pop(element);
+}
+
+
+} // namespace test
+} // namespace containers
+} // namespace embb
+
+#endif  // CONTAINERS_CPP_TEST_BLOCKING_STACK_TEST_INL_H_

containers_cpp/test/blocking_stack_test.h

+/*
+ * 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 <vector>
+#include <partest/partest.h>
+#include <embb/base/duration.h>
+#include <./blocking_container_test.h>
+
+namespace embb {
+namespace containers {
+namespace test {
+template<typename Stack_t>
+class BlockingStackTest : public BlockingContainerTest<Stack_t> {
+ 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_

containers_cpp/test/main.cc

@@ -29,6 +29,7 @@
 #include <embb/containers/wait_free_spsc_queue.h>
 #include <embb/containers/object_pool.h>
 #include <embb/containers/lock_free_stack.h>
+#include <embb/containers/blocking_stack.h>
 #include <embb/containers/lock_free_mpmc_queue.h>
 #include <embb/containers/blocking_queue.h>
 #include <embb/base/c/memory_allocation.h>
@@ -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<int> >);
   PT_RUN(StackTest< LockFreeStack<int> >);
+  PT_RUN(BlockingStackTest< BlockingStack<int> >);
   PT_RUN(ObjectPoolTest< LockFreeTreeValuePool<bool COMMA false > >);
   PT_RUN(ObjectPoolTest< WaitFreeArrayValuePool<bool COMMA false> >);