From ecd1ecdfe44d91c809855985d16f3a46000eb31c Mon Sep 17 00:00:00 2001
From: lucapegolotti <luca.pegolotti@epfl.ch>
Date: Fri, 29 Apr 2016 12:48:15 +0200
Subject: [PATCH] containers_cpp: add tests for blocking priority queue + get rid of namespace in blocking container class

---
 containers_cpp/include/embb/containers/blocking_container.h              | 4 ++--
 containers_cpp/include/embb/containers/internal/blocking_container-inl.h | 4 ++--
 containers_cpp/test/main.cc                                              | 3 +++
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/containers_cpp/include/embb/containers/blocking_container.h b/containers_cpp/include/embb/containers/blocking_container.h
index fa4a146..3e9a949 100755
--- a/containers_cpp/include/embb/containers/blocking_container.h
+++ b/containers_cpp/include/embb/containers/blocking_container.h
@@ -34,7 +34,6 @@
 namespace embb {
 namespace containers {
 
-using namespace base;
 
 /*
 * Abstract class to use for the implementation of blocking datastructure.
@@ -44,6 +43,7 @@ using namespace base;
 */
 template < typename Type >
 class BlockingContainer {
+  typedef embb::base::Mutex Mutex;
  protected:
   /*
   * Mutex for thread synchronization.
@@ -54,7 +54,7 @@ class BlockingContainer {
   * Condition variable for notifying threads that are waiting
   * for popping elements that new elements are available.
   */
-  ConditionVariable condition;
+  embb::base::ConditionVariable condition;
 
   /**
   * Pure virtual method to be implemented in derived classes.
diff --git a/containers_cpp/include/embb/containers/internal/blocking_container-inl.h b/containers_cpp/include/embb/containers/internal/blocking_container-inl.h
index 9e8b813..4753cc2 100755
--- a/containers_cpp/include/embb/containers/internal/blocking_container-inl.h
+++ b/containers_cpp/include/embb/containers/internal/blocking_container-inl.h
@@ -35,7 +35,7 @@ namespace containers {
 
 template<typename T>
 void BlockingContainer<T>::PushAndWakeUp(const T& element) {
-  LockGuard<Mutex> lock(mutex);
+  embb::base::LockGuard<Mutex> lock(mutex);
 
   SpecializedPush(element);
 
@@ -44,7 +44,7 @@ void BlockingContainer<T>::PushAndWakeUp(const T& element) {
 
 template<typename T>
 void BlockingContainer<T>::BlockingPop(T& element) {
-  UniqueLock<Mutex> lock(mutex);
+  embb::base::UniqueLock<Mutex> lock(mutex);
 
   while (IsEmpty()) {
     condition.Wait(lock);
diff --git a/containers_cpp/test/main.cc b/containers_cpp/test/main.cc
index 8f11809..0d45b03 100644
--- a/containers_cpp/test/main.cc
+++ b/containers_cpp/test/main.cc
@@ -32,6 +32,7 @@
 #include <embb/containers/blocking_stack.h>
 #include <embb/containers/lock_free_mpmc_queue.h>
 #include <embb/containers/blocking_queue.h>
+#include <embb/containers/blocking_priority_queue.h>
 #include <embb/containers/blocking_set.h>
 #include <embb/containers/blocking_map.h>
 #include <embb/base/c/memory_allocation.h>
@@ -56,6 +57,7 @@ using embb::containers::LockFreeTreeValuePool;
 using embb::containers::WaitFreeSPSCQueue;
 using embb::containers::LockFreeMPMCQueue;
 using embb::containers::BlockingQueue;
+using embb::containers::BlockingPriorityQueue;
 using embb::containers::LockFreeStack;
 using embb::containers::BlockingStack;
 using embb::containers::LockFreeTreeValuePool;
@@ -86,6 +88,7 @@ PT_MAIN("Data Structures C++") {
   PT_RUN(QueueTest< LockFreeMPMCQueue< ::std::pair<size_t COMMA int> >
     COMMA true COMMA true >);
   PT_RUN(BlockingQueueTest< BlockingQueue<int> >);
+  PT_RUN(BlockingQueueTest< BlockingPriorityQueue<int> >);
   PT_RUN(StackTest< LockFreeStack<int> >);
   PT_RUN(BlockingStackTest< BlockingStack<int> >);
   PT_RUN(SetTest< BlockingSet<int> >);
--
libgit2 0.26.0