Minor changes induced by improvements of Vyukov queue

diff --git a/cds/memory/vyukov_queue_pool.h b/cds/memory/vyukov_queue_pool.h
index cf324d663e84e03a919a3e50f9e538968897311a..1f839c7e972bd265fc454939fbac1f0cdacd73dc 100644 (file)
--- a/cds/memory/vyukov_queue_pool.h
+++ b/cds/memory/vyukov_queue_pool.h
@@ -15,9 +15,6 @@ namespace cds { namespace memory {
     {
         /// Allocator type
         typedef CDS_DEFAULT_ALLOCATOR allocator;
-
-        /// Back-off stratey
-        typedef cds::backoff::yield   back_off;
     };
 
     /// Free-list based on bounded lock-free queue \p cds::intrusive::VyukovMPMCCycleQueue

diff --git a/cds/urcu/details/gpt.h b/cds/urcu/details/gpt.h
index 626b18d83caf8cb199758ee1366196f63faa9b4f..ad38ef82828e8fefa50f7347ce5ac1110293e3d2 100644 (file)
--- a/cds/urcu/details/gpt.h
+++ b/cds/urcu/details/gpt.h
@@ -28,7 +28,7 @@ namespace cds { namespace urcu {
         that provides unified RCU interface. You should use this wrapper class instead \p %general_threaded
 
         Template arguments:
-        - \p Buffer - buffer type with FIFO semantics. Default is cds::container::VyukovMPMCCycleQueue. See \ref general_buffered
+        - \p Buffer - buffer type with FIFO semantics. Default is \p cds::container::VyukovMPMCCycleQueue. See \ref general_buffered
             for description of buffer's interface. The buffer contains the objects of \ref epoch_retired_ptr
             type that contains additional \p m_nEpoch field. This field specifies an epoch when the object
             has been placed into the buffer. The \p %general_threaded object has a global epoch counter

diff --git a/tests/unit/queue/bounded_queue_fulness.cpp b/tests/unit/queue/bounded_queue_fulness.cpp
index 6dd17cfb97d787d5d3d55c3c5bacb036538ad047..2d681f77f7f00a31910d804d48587f6e987a8f4d 100644 (file)
--- a/tests/unit/queue/bounded_queue_fulness.cpp
+++ b/tests/unit/queue/bounded_queue_fulness.cpp
@@ -21,52 +21,6 @@ namespace queue {
     }
     using namespace ns_BoundedQueue_Fullness;
 
-    class VyukovMPMCCycleQueue_dyn_fair_ : public Types<size_t>::VyukovMPMCCycleQueue_dyn_ic
-    {
-        typedef Types<size_t>::VyukovMPMCCycleQueue_dyn_ic base_class;
-    public:
-        typedef base_class::value_type value_type;
-
-        VyukovMPMCCycleQueue_dyn_fair_()
-            : base_class()
-        {}
-
-        VyukovMPMCCycleQueue_dyn_fair_( size_t nCapacity )
-            : base_class( nCapacity )
-        {}
-
-        bool enqueue( value_type const& data )
-        {
-            bool ret;
-            do {
-                ret = base_class::enqueue( data );
-            } while ( !ret && size() != capacity() );
-            return ret;
-        }
-
-        bool push( value_type const& data )
-        {
-            return enqueue( data );
-        }
-
-        bool dequeue( value_type& dest )
-        {
-            bool ret;
-            do {
-                ret = base_class::dequeue( dest );
-            } while ( !ret && size() != capacity() );
-            return ret;
-        }
-
-        bool pop( value_type& dest )
-        {
-            return dequeue( dest );
-        }
-
-        size_t size() const { return base_class::size(); }
-        size_t capacity() const { return base_class::capacity(); }
-    };
-
     class BoundedQueue_Fullness: public CppUnitMini::TestCase
     {
         template <class Queue>
@@ -172,15 +126,10 @@ namespace queue {
     protected:
         CDSUNIT_DECLARE_TsigasCycleQueue( size_t )
         CDSUNIT_DECLARE_VyukovMPMCCycleQueue( size_t )
-        void VyukovMPMCCycleQueue_dyn_fair()
-        {
-            test< VyukovMPMCCycleQueue_dyn_fair_ >();
-        }
 
         CPPUNIT_TEST_SUITE( BoundedQueue_Fullness )
             CDSUNIT_TEST_TsigasCycleQueue
             CDSUNIT_TEST_VyukovMPMCCycleQueue
-            CPPUNIT_TEST( VyukovMPMCCycleQueue_dyn_fair_ ) \
         CPPUNIT_TEST_SUITE_END();
     };