From f039dd7f3167b424692c6c6ccf49ee5f0e98c70a Mon Sep 17 00:00:00 2001 From: khizmax Date: Thu, 17 Dec 2015 22:57:32 +0300 Subject: [PATCH] Minor changes induced by improvements of Vyukov queue --- cds/memory/vyukov_queue_pool.h | 3 -- cds/urcu/details/gpt.h | 2 +- tests/unit/queue/bounded_queue_fulness.cpp | 51 ---------------------- 3 files changed, 1 insertion(+), 55 deletions(-) diff --git a/cds/memory/vyukov_queue_pool.h b/cds/memory/vyukov_queue_pool.h index cf324d66..1f839c7e 100644 --- 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 626b18d8..ad38ef82 100644 --- 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 6dd17cfb..2d681f77 100644 --- 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::VyukovMPMCCycleQueue_dyn_ic - { - typedef Types::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 @@ -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(); }; -- 2.34.1