Trims down unnecessary queue test casese
[libcds.git] / test / stress / queue / queue_type.h
index 0db165ec50d24152c3f8fe2b6fa0ae195eafbd1f..bcb14b769621b9234a4a10bbea2d1a6202328764 100644 (file)
@@ -1,11 +1,11 @@
 /*
     This file is a part of libcds - Concurrent Data Structures library
 
-    (C) Copyright Maxim Khizhinsky (libcds.dev@gmail.com) 2006-2016
+    (C) Copyright Maxim Khizhinsky (libcds.dev@gmail.com) 2006-2017
 
     Source code repo: http://github.com/khizmax/libcds/
     Download: http://sourceforge.net/projects/libcds/files/
-    
+
     Redistribution and use in source and binary forms, with or without
     modification, are permitted provided that the following conditions are met:
 
@@ -25,7 +25,7 @@
     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.     
+    OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
 #ifndef CDSSTRESS_QUEUE_TYPES_H
 #include <cds/container/moir_queue.h>
 #include <cds/container/rwqueue.h>
 #include <cds/container/optimistic_queue.h>
-#include <cds/container/tsigas_cycle_queue.h>
 #include <cds/container/vyukov_mpmc_cycle_queue.h>
 #include <cds/container/basket_queue.h>
 #include <cds/container/fcqueue.h>
 #include <cds/container/fcdeque.h>
 #include <cds/container/segmented_queue.h>
+#include <cds/container/weak_ringbuffer.h>
 
 #include <cds/gc/hp.h>
 #include <cds/gc/dhp.h>
 
 #include "std_queue.h"
 #include "lock/win32_lock.h"
-#include "framework/michael_alloc.h"
 
 #include <boost/container/deque.hpp>
 
 #include <cds_test/stress_test.h>
+#include <cds_test/stat_flat_combining_out.h>
+#include <cds_test/fc_hevy_value.h>
+
 #include "print_stat.h"
 
 namespace queue {
@@ -127,6 +129,56 @@ namespace queue {
 
     } // namespace details
 
+namespace fc_details{
+// FCDeque
+        struct traits_FCDeque_stat:
+            public cds::container::fcdeque::make_traits<
+                cds::opt::stat< cds::container::fcdeque::stat<> >
+            >::type
+        {};
+        struct traits_FCDeque_elimination:
+            public cds::container::fcdeque::make_traits<
+                cds::opt::enable_elimination< true >
+            >::type
+        {};
+        struct traits_FCDeque_elimination_stat:
+            public cds::container::fcdeque::make_traits<
+                cds::opt::stat< cds::container::fcdeque::stat<> >,
+                cds::opt::enable_elimination< true >
+            >::type
+        {};
+        struct traits_FCDeque_mutex:
+            public cds::container::fcdeque::make_traits<
+                cds::opt::lock_type< std::mutex >
+            >::type
+        {};
+
+        struct traits_FCDeque_wait_ss: cds::container::fcdeque::traits
+        {
+            typedef cds::algo::flat_combining::wait_strategy::single_mutex_single_condvar<> wait_strategy;
+        };
+        struct traits_FCDeque_wait_ss_stat: traits_FCDeque_wait_ss
+        {
+            typedef cds::container::fcdeque::stat<> stat;
+        };
+        struct traits_FCDeque_wait_sm: cds::container::fcdeque::traits
+        {
+            typedef cds::algo::flat_combining::wait_strategy::single_mutex_multi_condvar<> wait_strategy;
+        };
+        struct traits_FCDeque_wait_sm_stat: traits_FCDeque_wait_sm
+        {
+            typedef cds::container::fcdeque::stat<> stat;
+        };
+        struct traits_FCDeque_wait_mm: cds::container::fcdeque::traits
+        {
+            typedef cds::algo::flat_combining::wait_strategy::multi_mutex_multi_condvar<> wait_strategy;
+        };
+        struct traits_FCDeque_wait_mm_stat: traits_FCDeque_wait_mm
+        {
+            typedef cds::container::fcdeque::stat<> stat;
+        };
+
+}
     template <typename Value>
     struct Types {
 
@@ -136,15 +188,6 @@ namespace queue {
         typedef cds::container::MoirQueue<cds::gc::HP, Value > MoirQueue_HP;
         typedef cds::container::MoirQueue<cds::gc::DHP, Value > MoirQueue_DHP;
 
-        struct traits_MSQueue_michaelAlloc : public cds::container::msqueue::traits
-        {
-            typedef memory::MichaelAllocator<int>  allocator;
-        };
-        typedef cds::container::MSQueue<cds::gc::HP,  Value, traits_MSQueue_michaelAlloc > MSQueue_HP_michaelAlloc;
-        typedef cds::container::MSQueue<cds::gc::DHP, Value, traits_MSQueue_michaelAlloc > MSQueue_DHP_michaelAlloc;
-        typedef cds::container::MoirQueue<cds::gc::HP, Value, traits_MSQueue_michaelAlloc > MoirQueue_HP_michaelAlloc;
-        typedef cds::container::MoirQueue<cds::gc::DHP, Value, traits_MSQueue_michaelAlloc > MoirQueue_DHP_michaelAlloc;
-
         struct traits_MSQueue_seqcst : public
             cds::container::msqueue::make_traits <
                 cds::opt::memory_model < cds::opt::v::sequential_consistent >
@@ -182,13 +225,6 @@ namespace queue {
         typedef cds::container::OptimisticQueue< cds::gc::HP, Value > OptimisticQueue_HP;
         typedef cds::container::OptimisticQueue< cds::gc::DHP, Value > OptimisticQueue_DHP;
 
-        struct traits_OptimisticQueue_michaelAlloc : public cds::container::optimistic_queue::traits
-        {
-            typedef memory::MichaelAllocator<int> allocator;
-        };
-        typedef cds::container::OptimisticQueue< cds::gc::HP,  Value, traits_OptimisticQueue_michaelAlloc > OptimisticQueue_HP_michaelAlloc;
-        typedef cds::container::OptimisticQueue< cds::gc::DHP, Value, traits_OptimisticQueue_michaelAlloc > OptimisticQueue_DHP_michaelAlloc;
-
         struct traits_OptimisticQueue_seqcst : public cds::container::optimistic_queue::traits
         {
             typedef cds::opt::v::sequential_consistent memory_model;
@@ -212,26 +248,20 @@ namespace queue {
         typedef cds::container::OptimisticQueue< cds::gc::DHP, Value, traits_OptimisticQueue_stat > OptimisticQueue_DHP_stat;
 
 
-        // TsigasCycleQueue
-
-        class TsigasCycleQueue_dyn
-            : public cds::container::TsigasCycleQueue< Value,
-                typename cds::container::tsigas_queue::make_traits<
-                    cds::opt::buffer< cds::opt::v::initialized_dynamic_buffer< int > >
-                >::type
-            >
+        // VyukovMPMCCycleQueue
+        struct traits_VyukovMPMCCycleQueue_dyn : public cds::container::vyukov_queue::traits
         {
-            typedef cds::container::TsigasCycleQueue< Value,
-                typename cds::container::tsigas_queue::make_traits<
-                    cds::opt::buffer< cds::opt::v::initialized_dynamic_buffer< int > >
-                >::type
-            > base_class;
+            typedef cds::opt::v::uninitialized_dynamic_buffer< int > buffer;
+        };
+        class VyukovMPMCCycleQueue_dyn
+            : public cds::container::VyukovMPMCCycleQueue< Value, traits_VyukovMPMCCycleQueue_dyn >
+        {
+            typedef cds::container::VyukovMPMCCycleQueue< Value, traits_VyukovMPMCCycleQueue_dyn > base_class;
         public:
-            TsigasCycleQueue_dyn()
+            VyukovMPMCCycleQueue_dyn()
                 : base_class( 1024 * 64 )
             {}
-
-            TsigasCycleQueue_dyn( size_t nCapacity )
+            VyukovMPMCCycleQueue_dyn( size_t nCapacity )
                 : base_class( nCapacity )
             {}
 
@@ -241,26 +271,19 @@ namespace queue {
             }
         };
 
-        class TsigasCycleQueue_dyn_michaelAlloc
-            : public cds::container::TsigasCycleQueue< Value,
-                typename cds::container::tsigas_queue::make_traits<
-                    cds::opt::buffer< cds::opt::v::initialized_dynamic_buffer< int > >
-                    ,cds::opt::allocator< memory::MichaelAllocator<int> >
-                >::type
-            >
+        struct traits_VyukovMPMCCycleQueue_dyn_ic : public traits_VyukovMPMCCycleQueue_dyn
         {
-            typedef cds::container::TsigasCycleQueue< Value,
-                typename cds::container::tsigas_queue::make_traits<
-                   cds::opt::buffer< cds::opt::v::initialized_dynamic_buffer< int > >
-                    , cds::opt::allocator< memory::MichaelAllocator<int> >
-                >::type
-            > base_class;
+            typedef cds::atomicity::item_counter item_counter;
+        };
+        class VyukovMPMCCycleQueue_dyn_ic
+            : public cds::container::VyukovMPMCCycleQueue< Value, traits_VyukovMPMCCycleQueue_dyn_ic >
+        {
+            typedef cds::container::VyukovMPMCCycleQueue< Value, traits_VyukovMPMCCycleQueue_dyn_ic > base_class;
         public:
-            TsigasCycleQueue_dyn_michaelAlloc()
+            VyukovMPMCCycleQueue_dyn_ic()
                 : base_class( 1024 * 64 )
             {}
-
-            TsigasCycleQueue_dyn_michaelAlloc( size_t nCapacity )
+            VyukovMPMCCycleQueue_dyn_ic( size_t nCapacity )
                 : base_class( nCapacity )
             {}
 
@@ -270,25 +293,20 @@ namespace queue {
             }
         };
 
-        class TsigasCycleQueue_dyn_ic
-            : public cds::container::TsigasCycleQueue< Value,
-                typename cds::container::tsigas_queue::make_traits<
-                    cds::opt::buffer< cds::opt::v::initialized_dynamic_buffer< int > >
-                    ,cds::opt::item_counter< cds::atomicity::item_counter >
-                >::type
-            >
+        // singlre-consumer version
+        struct traits_VyukovMPSCCycleQueue_dyn: public traits_VyukovMPMCCycleQueue_dyn
+        {
+            static const bool single_consumer = true;
+        };
+        class VyukovMPSCCycleQueue_dyn
+            : public cds::container::VyukovMPMCCycleQueue< Value, traits_VyukovMPSCCycleQueue_dyn >
         {
-            typedef cds::container::TsigasCycleQueue< Value,
-                typename cds::container::tsigas_queue::make_traits<
-                    cds::opt::buffer< cds::opt::v::initialized_dynamic_buffer< int > >
-                    ,cds::opt::item_counter< cds::atomicity::item_counter >
-                >::type
-            > base_class;
+            typedef cds::container::VyukovMPMCCycleQueue< Value, traits_VyukovMPSCCycleQueue_dyn > base_class;
         public:
-            TsigasCycleQueue_dyn_ic()
+            VyukovMPSCCycleQueue_dyn()
                 : base_class( 1024 * 64 )
             {}
-            TsigasCycleQueue_dyn_ic( size_t nCapacity )
+            VyukovMPSCCycleQueue_dyn( size_t nCapacity )
                 : base_class( nCapacity )
             {}
 
@@ -298,20 +316,19 @@ namespace queue {
             }
         };
 
-        // VyukovMPMCCycleQueue
-        struct traits_VyukovMPMCCycleQueue_dyn : public cds::container::vyukov_queue::traits
+        struct traits_VyukovMPSCCycleQueue_dyn_ic: public traits_VyukovMPMCCycleQueue_dyn
         {
-            typedef cds::opt::v::uninitialized_dynamic_buffer< int > buffer;
+            static const bool single_consumer = true;
         };
-        class VyukovMPMCCycleQueue_dyn
-            : public cds::container::VyukovMPMCCycleQueue< Value, traits_VyukovMPMCCycleQueue_dyn >
+        class VyukovMPSCCycleQueue_dyn_ic
+            : public cds::container::VyukovMPMCCycleQueue< Value, traits_VyukovMPSCCycleQueue_dyn_ic >
         {
-            typedef cds::container::VyukovMPMCCycleQueue< Value, traits_VyukovMPMCCycleQueue_dyn > base_class;
+            typedef cds::container::VyukovMPMCCycleQueue< Value, traits_VyukovMPSCCycleQueue_dyn_ic > base_class;
         public:
-            VyukovMPMCCycleQueue_dyn()
+            VyukovMPSCCycleQueue_dyn_ic()
                 : base_class( 1024 * 64 )
             {}
-            VyukovMPMCCycleQueue_dyn( size_t nCapacity )
+            VyukovMPSCCycleQueue_dyn_ic( size_t nCapacity )
                 : base_class( nCapacity )
             {}
 
@@ -321,19 +338,21 @@ namespace queue {
             }
         };
 
-        struct traits_VyukovMPMCCycleQueue_dyn_michaelAlloc : public cds::container::vyukov_queue::traits
+
+        // WeakRingBuffer
+        struct traits_WeakRingBuffer_dyn: public cds::container::weak_ringbuffer::traits
         {
-            typedef cds::opt::v::uninitialized_dynamic_buffer< int, memory::MichaelAllocator<int> > buffer;
+            typedef cds::opt::v::uninitialized_dynamic_buffer< int > buffer;
         };
-        class VyukovMPMCCycleQueue_dyn_michaelAlloc
-            : public cds::container::VyukovMPMCCycleQueue< Value, traits_VyukovMPMCCycleQueue_dyn_michaelAlloc >
+        class WeakRingBuffer_dyn
+            : public cds::container::WeakRingBuffer< Value, traits_WeakRingBuffer_dyn >
         {
-            typedef cds::container::VyukovMPMCCycleQueue< Value, traits_VyukovMPMCCycleQueue_dyn_michaelAlloc > base_class;
+            typedef cds::container::WeakRingBuffer< Value, traits_WeakRingBuffer_dyn > base_class;
         public:
-            VyukovMPMCCycleQueue_dyn_michaelAlloc()
+            WeakRingBuffer_dyn()
                 : base_class( 1024 * 64 )
             {}
-            VyukovMPMCCycleQueue_dyn_michaelAlloc( size_t nCapacity )
+            WeakRingBuffer_dyn( size_t nCapacity )
                 : base_class( nCapacity )
             {}
 
@@ -343,19 +362,15 @@ namespace queue {
             }
         };
 
-        struct traits_VyukovMPMCCycleQueue_dyn_ic : public traits_VyukovMPMCCycleQueue_dyn
-        {
-            typedef cds::atomicity::item_counter item_counter;
-        };
-        class VyukovMPMCCycleQueue_dyn_ic
-            : public cds::container::VyukovMPMCCycleQueue< Value, traits_VyukovMPMCCycleQueue_dyn_ic >
+        class WeakRingBuffer_void_dyn
+            : public cds::container::WeakRingBuffer< void, traits_WeakRingBuffer_dyn >
         {
-            typedef cds::container::VyukovMPMCCycleQueue< Value, traits_VyukovMPMCCycleQueue_dyn_ic > base_class;
+            typedef cds::container::WeakRingBuffer< void, traits_WeakRingBuffer_dyn > base_class;
         public:
-            VyukovMPMCCycleQueue_dyn_ic()
+            WeakRingBuffer_void_dyn()
                 : base_class( 1024 * 64 )
             {}
-            VyukovMPMCCycleQueue_dyn_ic( size_t nCapacity )
+            WeakRingBuffer_void_dyn( size_t nCapacity )
                 : base_class( nCapacity )
             {}
 
@@ -365,19 +380,11 @@ namespace queue {
             }
         };
 
-
         // BasketQueue
 
         typedef cds::container::BasketQueue< cds::gc::HP , Value > BasketQueue_HP;
         typedef cds::container::BasketQueue< cds::gc::DHP, Value > BasketQueue_DHP;
 
-        struct traits_BasketQueue_michaelAlloc : public cds::container::basket_queue::traits
-        {
-            typedef memory::MichaelAllocator<int> allocator;
-        };
-        typedef cds::container::BasketQueue< cds::gc::HP,  Value, traits_BasketQueue_michaelAlloc > BasketQueue_HP_michaelAlloc;
-        typedef cds::container::BasketQueue< cds::gc::DHP, Value, traits_BasketQueue_michaelAlloc > BasketQueue_DHP_michaelAlloc;
-
         struct traits_BasketQueue_seqcst : public cds::container::basket_queue::traits
         {
             typedef cds::opt::v::sequential_consistent mamory_model;
@@ -417,12 +424,44 @@ namespace queue {
         typedef cds::container::RWQueue< Value, traits_RWQueue_mutex > RWQueue_mutex;
 
         // FCQueue
-        class traits_FCQueue_elimination:
+        struct traits_FCQueue_stat:
+            public cds::container::fcqueue::make_traits<
+                cds::opt::stat< cds::container::fcqueue::stat<> >
+            >::type
+        {};
+        struct traits_FCQueue_single_mutex_single_condvar:
+            public cds::container::fcqueue::make_traits<
+                cds::opt::wait_strategy< cds::algo::flat_combining::wait_strategy::single_mutex_single_condvar<>>
+            >::type
+        {};
+        struct traits_FCQueue_single_mutex_single_condvar_stat: traits_FCQueue_single_mutex_single_condvar
+        {
+            typedef cds::container::fcqueue::stat<> stat;
+        };
+        struct traits_FCQueue_single_mutex_multi_condvar:
+            public cds::container::fcqueue::make_traits<
+                cds::opt::wait_strategy< cds::algo::flat_combining::wait_strategy::single_mutex_multi_condvar<>>
+            >::type
+        {};
+        struct traits_FCQueue_single_mutex_multi_condvar_stat: traits_FCQueue_single_mutex_multi_condvar
+        {
+            typedef cds::container::fcqueue::stat<> stat;
+        };
+        struct traits_FCQueue_multi_mutex_multi_condvar:
+            public cds::container::fcqueue::make_traits<
+                cds::opt::wait_strategy< cds::algo::flat_combining::wait_strategy::multi_mutex_multi_condvar<>>
+            >::type
+        {};
+        struct traits_FCQueue_multi_mutex_multi_condvar_stat: traits_FCQueue_multi_mutex_multi_condvar
+        {
+            typedef cds::container::fcqueue::stat<> stat;
+        };
+        struct traits_FCQueue_elimination:
             public cds::container::fcqueue::make_traits<
                 cds::opt::enable_elimination< true >
             >::type
         {};
-        class traits_FCQueue_elimination_stat:
+        struct traits_FCQueue_elimination_stat:
             public cds::container::fcqueue::make_traits<
                 cds::opt::enable_elimination< true >
                 ,cds::opt::stat< cds::container::fcqueue::stat<> >
@@ -430,59 +469,66 @@ namespace queue {
         {};
 
         typedef cds::container::FCQueue< Value > FCQueue_deque;
+        typedef cds::container::FCQueue< Value, std::queue<Value>, traits_FCQueue_stat > FCQueue_deque_stat;
+        typedef cds::container::FCQueue< Value, std::queue<Value>, traits_FCQueue_single_mutex_single_condvar> FCQueue_deque_wait_ss;
+        typedef cds::container::FCQueue< Value, std::queue<Value>, traits_FCQueue_single_mutex_single_condvar_stat> FCQueue_deque_wait_ss_stat;
+        typedef cds::container::FCQueue< Value, std::queue<Value>, traits_FCQueue_single_mutex_multi_condvar> FCQueue_deque_wait_sm;
+        typedef cds::container::FCQueue< Value, std::queue<Value>, traits_FCQueue_single_mutex_multi_condvar_stat> FCQueue_deque_wait_sm_stat;
+        typedef cds::container::FCQueue< Value, std::queue<Value>, traits_FCQueue_multi_mutex_multi_condvar> FCQueue_deque_wait_mm;
+        typedef cds::container::FCQueue< Value, std::queue<Value>, traits_FCQueue_multi_mutex_multi_condvar_stat> FCQueue_deque_wait_mm_stat;
+
         typedef cds::container::FCQueue< Value, std::queue<Value>, traits_FCQueue_elimination > FCQueue_deque_elimination;
         typedef cds::container::FCQueue< Value, std::queue<Value>, traits_FCQueue_elimination_stat > FCQueue_deque_elimination_stat;
 
-        typedef cds::container::FCQueue< Value, std::queue<Value, std::list<Value> > > FCQueue_list;
+        typedef cds::container::FCQueue< Value, std::queue<Value, std::list<Value>>> FCQueue_list;
+        typedef cds::container::FCQueue< Value, std::queue<Value, std::list<Value>>, traits_FCQueue_stat> FCQueue_list_stat;
+        typedef cds::container::FCQueue< Value, std::queue<Value, std::list<Value>>, traits_FCQueue_single_mutex_single_condvar> FCQueue_list_wait_ss;
+        typedef cds::container::FCQueue< Value, std::queue<Value, std::list<Value>>, traits_FCQueue_single_mutex_single_condvar_stat> FCQueue_list_wait_ss_stat;
+        typedef cds::container::FCQueue< Value, std::queue<Value, std::list<Value>>, traits_FCQueue_single_mutex_multi_condvar> FCQueue_list_wait_sm;
+        typedef cds::container::FCQueue< Value, std::queue<Value, std::list<Value>>, traits_FCQueue_single_mutex_multi_condvar_stat> FCQueue_list_wait_sm_stat;
+        typedef cds::container::FCQueue< Value, std::queue<Value, std::list<Value>>, traits_FCQueue_multi_mutex_multi_condvar> FCQueue_list_wait_mm;
+        typedef cds::container::FCQueue< Value, std::queue<Value, std::list<Value>>, traits_FCQueue_multi_mutex_multi_condvar_stat> FCQueue_list_wait_mm_stat;
+
         typedef cds::container::FCQueue< Value, std::queue<Value, std::list<Value> >, traits_FCQueue_elimination > FCQueue_list_elimination;
         typedef cds::container::FCQueue< Value, std::queue<Value, std::list<Value> >, traits_FCQueue_elimination_stat > FCQueue_list_elimination_stat;
 
 
-   // FCDeque
-        struct traits_FCDeque_stat:
-            public cds::container::fcdeque::make_traits<
-                cds::opt::stat< cds::container::fcdeque::stat<> >
-            >::type
-        {};
-        struct traits_FCDeque_elimination:
-            public cds::container::fcdeque::make_traits<
-                cds::opt::enable_elimination< true >
-            >::type
-        {};
-        struct traits_FCDeque_elimination_stat:
-            public cds::container::fcdeque::make_traits<
-                cds::opt::stat< cds::container::fcdeque::stat<> >,
-                cds::opt::enable_elimination< true >
-            >::type
-        {};
-        struct traits_FCDeque_mutex:
-            public cds::container::fcdeque::make_traits<
-                cds::opt::lock_type< std::mutex >
-            >::type
-        {};
 
         typedef details::FCDequeL< Value > FCDequeL_default;
-        typedef details::FCDequeL< Value, traits_FCDeque_mutex > FCDequeL_mutex;
-        typedef details::FCDequeL< Value, traits_FCDeque_stat > FCDequeL_stat;
-        typedef details::FCDequeL< Value, traits_FCDeque_elimination > FCDequeL_elimination;
-        typedef details::FCDequeL< Value, traits_FCDeque_elimination_stat > FCDequeL_elimination_stat;
+        typedef details::FCDequeL< Value, fc_details::traits_FCDeque_mutex > FCDequeL_mutex;
+        typedef details::FCDequeL< Value, fc_details::traits_FCDeque_stat > FCDequeL_stat;
+        typedef details::FCDequeL< Value, fc_details::traits_FCDeque_wait_ss > FCDequeL_wait_ss;
+        typedef details::FCDequeL< Value, fc_details::traits_FCDeque_wait_ss_stat > FCDequeL_wait_ss_stat;
+        typedef details::FCDequeL< Value, fc_details::traits_FCDeque_wait_sm > FCDequeL_wait_sm;
+        typedef details::FCDequeL< Value, fc_details::traits_FCDeque_wait_sm_stat > FCDequeL_wait_sm_stat;
+        typedef details::FCDequeL< Value, fc_details::traits_FCDeque_wait_mm > FCDequeL_wait_mm;
+        typedef details::FCDequeL< Value, fc_details::traits_FCDeque_wait_mm_stat > FCDequeL_wait_mm_stat;
+        typedef details::FCDequeL< Value, fc_details::traits_FCDeque_elimination > FCDequeL_elimination;
+        typedef details::FCDequeL< Value, fc_details::traits_FCDeque_elimination_stat > FCDequeL_elimination_stat;
 
         typedef details::FCDequeL< Value, cds::container::fcdeque::traits, boost::container::deque<Value> > FCDequeL_boost;
-        typedef details::FCDequeL< Value, traits_FCDeque_stat, boost::container::deque<Value> > FCDequeL_boost_stat;
-        typedef details::FCDequeL< Value, traits_FCDeque_elimination, boost::container::deque<Value> > FCDequeL_boost_elimination;
-        typedef details::FCDequeL< Value, traits_FCDeque_elimination_stat, boost::container::deque<Value> > FCDequeL_boost_elimination_stat;
+        typedef details::FCDequeL< Value, fc_details::traits_FCDeque_stat, boost::container::deque<Value> > FCDequeL_boost_stat;
+        typedef details::FCDequeL< Value, fc_details::traits_FCDeque_elimination, boost::container::deque<Value> > FCDequeL_boost_elimination;
+        typedef details::FCDequeL< Value, fc_details::traits_FCDeque_elimination_stat, boost::container::deque<Value> > FCDequeL_boost_elimination_stat;
 
         typedef details::FCDequeR< Value > FCDequeR_default;
-        typedef details::FCDequeR< Value, traits_FCDeque_mutex > FCDequeR_mutex;
-        typedef details::FCDequeR< Value, traits_FCDeque_stat > FCDequeR_stat;
-        typedef details::FCDequeR< Value, traits_FCDeque_elimination > FCDequeR_elimination;
-        typedef details::FCDequeR< Value, traits_FCDeque_elimination_stat > FCDequeR_elimination_stat;
+        typedef details::FCDequeR< Value, fc_details::traits_FCDeque_mutex > FCDequeR_mutex;
+        typedef details::FCDequeR< Value, fc_details::traits_FCDeque_stat > FCDequeR_stat;
+        typedef details::FCDequeR< Value, fc_details::traits_FCDeque_wait_ss > FCDequeR_wait_ss;
+        typedef details::FCDequeR< Value, fc_details::traits_FCDeque_wait_ss_stat > FCDequeR_wait_ss_stat;
+        typedef details::FCDequeR< Value, fc_details::traits_FCDeque_wait_sm > FCDequeR_wait_sm;
+        typedef details::FCDequeR< Value, fc_details::traits_FCDeque_wait_sm_stat > FCDequeR_wait_sm_stat;
+        typedef details::FCDequeR< Value, fc_details::traits_FCDeque_wait_mm > FCDequeR_wait_mm;
+        typedef details::FCDequeR< Value, fc_details::traits_FCDeque_wait_mm_stat > FCDequeR_wait_mm_stat;
+        typedef details::FCDequeR< Value, fc_details::traits_FCDeque_elimination > FCDequeR_elimination;
+        typedef details::FCDequeR< Value, fc_details::traits_FCDeque_elimination_stat > FCDequeR_elimination_stat;
 
         typedef details::FCDequeR< Value, cds::container::fcdeque::traits, boost::container::deque<Value> > FCDequeR_boost;
-        typedef details::FCDequeR< Value, traits_FCDeque_stat, boost::container::deque<Value> > FCDequeR_boost_stat;
-        typedef details::FCDequeR< Value, traits_FCDeque_elimination, boost::container::deque<Value> > FCDequeR_boost_elimination;
-        typedef details::FCDequeR< Value, traits_FCDeque_elimination_stat, boost::container::deque<Value> > FCDequeR_boost_elimination_stat;
+        typedef details::FCDequeR< Value, fc_details::traits_FCDeque_stat, boost::container::deque<Value> > FCDequeR_boost_stat;
+        typedef details::FCDequeR< Value, fc_details::traits_FCDeque_elimination, boost::container::deque<Value> > FCDequeR_boost_elimination;
+        typedef details::FCDequeR< Value, fc_details::traits_FCDeque_elimination_stat, boost::container::deque<Value> > FCDequeR_boost_elimination_stat;
 
+        // STL
         typedef StdQueue_deque<Value>               StdQueue_deque_Spinlock;
         typedef StdQueue_list<Value>                StdQueue_list_Spinlock;
         typedef StdQueue_deque<Value, std::mutex>   StdQueue_deque_Mutex;
@@ -537,6 +583,43 @@ namespace queue {
         typedef cds::container::SegmentedQueue< cds::gc::DHP, Value, traits_SegmentedQueue_mutex_padding >  SegmentedQueue_DHP_mutex_padding;
         typedef cds::container::SegmentedQueue< cds::gc::DHP, Value, traits_SegmentedQueue_mutex_stat >  SegmentedQueue_DHP_mutex_stat;
     };
+
+    template <typename Value>
+    struct TypesFCHeavyValue {
+        typedef details::FCDequeL< Value > FCDequeL_HeavyValue_default;
+        typedef details::FCDequeL< Value, fc_details::traits_FCDeque_mutex > FCDequeL_HeavyValue_mutex;
+        typedef details::FCDequeL< Value, fc_details::traits_FCDeque_stat > FCDequeL_HeavyValue_stat;
+        typedef details::FCDequeL< Value, fc_details::traits_FCDeque_wait_ss > FCDequeL_HeavyValue_wait_ss;
+        typedef details::FCDequeL< Value, fc_details::traits_FCDeque_wait_ss_stat > FCDequeL_HeavyValue_wait_ss_stat;
+        typedef details::FCDequeL< Value, fc_details::traits_FCDeque_wait_sm > FCDequeL_HeavyValue_wait_sm;
+        typedef details::FCDequeL< Value, fc_details::traits_FCDeque_wait_sm_stat > FCDequeL_HeavyValue_wait_sm_stat;
+        typedef details::FCDequeL< Value, fc_details::traits_FCDeque_wait_mm > FCDequeL_HeavyValue_wait_mm;
+        typedef details::FCDequeL< Value, fc_details::traits_FCDeque_wait_mm_stat > FCDequeL_HeavyValue_wait_mm_stat;
+        typedef details::FCDequeL< Value, fc_details::traits_FCDeque_elimination > FCDequeL_HeavyValue_elimination;
+        typedef details::FCDequeL< Value, fc_details::traits_FCDeque_elimination_stat > FCDequeL_HeavyValue_elimination_stat;
+
+        typedef details::FCDequeL< Value, cds::container::fcdeque::traits, boost::container::deque<Value> > FCDequeL_HeavyValue_boost;
+        typedef details::FCDequeL< Value, fc_details::traits_FCDeque_stat, boost::container::deque<Value> > FCDequeL_HeavyValue_boost_stat;
+        typedef details::FCDequeL< Value, fc_details::traits_FCDeque_elimination, boost::container::deque<Value> > FCDequeL_HeavyValue_boost_elimination;
+        typedef details::FCDequeL< Value, fc_details::traits_FCDeque_elimination_stat, boost::container::deque<Value> > FCDequeL_HeavyValue_boost_elimination_stat;
+
+        typedef details::FCDequeR< Value > FCDequeR_HeavyValue_default;
+        typedef details::FCDequeR< Value, fc_details::traits_FCDeque_mutex > FCDequeR_HeavyValue_mutex;
+        typedef details::FCDequeR< Value, fc_details::traits_FCDeque_stat > FCDequeR_HeavyValue_stat;
+        typedef details::FCDequeR< Value, fc_details::traits_FCDeque_wait_ss > FCDequeR_HeavyValue_wait_ss;
+        typedef details::FCDequeR< Value, fc_details::traits_FCDeque_wait_ss_stat > FCDequeR_HeavyValue_wait_ss_stat;
+        typedef details::FCDequeR< Value, fc_details::traits_FCDeque_wait_sm > FCDequeR_HeavyValue_wait_sm;
+        typedef details::FCDequeR< Value, fc_details::traits_FCDeque_wait_sm_stat > FCDequeR_HeavyValue_wait_sm_stat;
+        typedef details::FCDequeR< Value, fc_details::traits_FCDeque_wait_mm > FCDequeR_HeavyValue_wait_mm;
+        typedef details::FCDequeR< Value, fc_details::traits_FCDeque_wait_mm_stat > FCDequeR_HeavyValue_wait_mm_stat;
+        typedef details::FCDequeR< Value, fc_details::traits_FCDeque_elimination > FCDequeR_HeavyValue_elimination;
+        typedef details::FCDequeR< Value, fc_details::traits_FCDeque_elimination_stat > FCDequeR_HeavyValue_elimination_stat;
+
+        typedef details::FCDequeR< Value, cds::container::fcdeque::traits, boost::container::deque<Value> > FCDequeR_HeavyValue_boost;
+        typedef details::FCDequeR< Value, fc_details::traits_FCDeque_stat, boost::container::deque<Value> > FCDequeR_HeavyValue_boost_stat;
+        typedef details::FCDequeR< Value, fc_details::traits_FCDeque_elimination, boost::container::deque<Value> > FCDequeR_HeavyValue_boost_elimination;
+        typedef details::FCDequeR< Value, fc_details::traits_FCDeque_elimination_stat, boost::container::deque<Value> > FCDequeR_HeavyValue_boost_elimination_stat;
+    };
 }
 
 
@@ -553,16 +636,7 @@ namespace cds_test {
                 << CDSSTRESS_STAT_OUT( s, m_nDequeue )
                 << CDSSTRESS_STAT_OUT( s, m_nFailedDeq )
                 << CDSSTRESS_STAT_OUT( s, m_nCollided )
-                << CDSSTRESS_STAT_OUT_( "combining_factor", s.combining_factor() )
-                << CDSSTRESS_STAT_OUT( s, m_nOperationCount )
-                << CDSSTRESS_STAT_OUT( s, m_nCombiningCount )
-                << CDSSTRESS_STAT_OUT( s, m_nCompactPublicationList )
-                << CDSSTRESS_STAT_OUT( s, m_nDeactivatePubRecord )
-                << CDSSTRESS_STAT_OUT( s, m_nActivatePubRecord )
-                << CDSSTRESS_STAT_OUT( s, m_nPubRecordCreated )
-                << CDSSTRESS_STAT_OUT( s, m_nPubRecordDeteted )
-                << CDSSTRESS_STAT_OUT( s, m_nAcquirePubRecCount )
-                << CDSSTRESS_STAT_OUT( s, m_nReleasePubRecCount );
+                << static_cast<cds::algo::flat_combining::stat<> const&>(s);
     }
 
     static inline property_stream& operator <<( property_stream& o, cds::container::fcqueue::empty_stat const& /*s*/ )
@@ -587,16 +661,7 @@ namespace cds_test {
             << CDSSTRESS_STAT_OUT( s, m_nPopBack )
             << CDSSTRESS_STAT_OUT( s, m_nFailedPopBack )
             << CDSSTRESS_STAT_OUT( s, m_nCollided )
-            << CDSSTRESS_STAT_OUT_( "combining_factor", s.combining_factor() )
-            << CDSSTRESS_STAT_OUT( s, m_nOperationCount )
-            << CDSSTRESS_STAT_OUT( s, m_nCombiningCount )
-            << CDSSTRESS_STAT_OUT( s, m_nCompactPublicationList )
-            << CDSSTRESS_STAT_OUT( s, m_nDeactivatePubRecord )
-            << CDSSTRESS_STAT_OUT( s, m_nActivatePubRecord )
-            << CDSSTRESS_STAT_OUT( s, m_nPubRecordCreated )
-            << CDSSTRESS_STAT_OUT( s, m_nPubRecordDeteted )
-            << CDSSTRESS_STAT_OUT( s, m_nAcquirePubRecCount )
-            << CDSSTRESS_STAT_OUT( s, m_nReleasePubRecCount );
+            << static_cast<cds::algo::flat_combining::stat<> const&>(s);
     }
 
 } // namespace cds_test
@@ -609,116 +674,155 @@ namespace cds_test {
         test( queue ); \
     }
 
+#define CDSSTRESS_FCQueue_F( test_fixture, type_name ) \
+    TEST_F( test_fixture, type_name ) \
+    { \
+        typedef queue::TypesFCHeavyValue< value_type >::type_name queue_type; \
+        queue_type queue; \
+        test( queue ); \
+    }
+
+#if defined(CDS_STRESS_TEST_LEVEL) && CDS_STRESS_TEST_LEVEL > 0
+#   define CDSSTRESS_MSQueue_1( test_fixture ) \
+        CDSSTRESS_Queue_F( test_fixture, MSQueue_HP_ic      ) \
+        CDSSTRESS_Queue_F( test_fixture, MSQueue_DHP_ic     ) \
+
+#   define CDSSTRESS_MoirQueue_1( test_fixture ) \
+        CDSSTRESS_Queue_F( test_fixture, MoirQueue_HP_ic        ) \
+        CDSSTRESS_Queue_F( test_fixture, MoirQueue_DHP_ic       ) \
+
+#   define CDSSTRESS_OptimsticQueue_1( test_fixture ) \
+        CDSSTRESS_Queue_F( test_fixture, OptimisticQueue_HP_ic      ) \
+        CDSSTRESS_Queue_F( test_fixture, OptimisticQueue_DHP_ic     ) \
+
+#   define CDSSTRESS_BasketQueue_1( test_fixture ) \
+        CDSSTRESS_Queue_F( test_fixture, BasketQueue_HP_ic      ) \
+        CDSSTRESS_Queue_F( test_fixture, BasketQueue_DHP_ic     ) \
+
+#   define CDSSTRESS_FCQueue_1( test_fixture ) \
+        CDSSTRESS_Queue_F( test_fixture, FCQueue_deque_wait_ss      ) \
+        CDSSTRESS_Queue_F( test_fixture, FCQueue_deque_wait_sm      ) \
+        CDSSTRESS_Queue_F( test_fixture, FCQueue_deque_wait_mm      ) \
+        CDSSTRESS_Queue_F( test_fixture, FCQueue_deque_elimination  ) \
+        CDSSTRESS_Queue_F( test_fixture, FCQueue_list_wait_ss       ) \
+        CDSSTRESS_Queue_F( test_fixture, FCQueue_list_wait_sm       ) \
+        CDSSTRESS_Queue_F( test_fixture, FCQueue_list_wait_mm       ) \
+        CDSSTRESS_Queue_F( test_fixture, FCQueue_list_elimination   ) \
+
+#   define CDSSTRESS_FCDeque_1( test_fixture ) \
+        CDSSTRESS_Queue_F( test_fixture, FCDequeL_wait_ss           )\
+        CDSSTRESS_Queue_F( test_fixture, FCDequeL_wait_sm           ) \
+        CDSSTRESS_Queue_F( test_fixture, FCDequeL_wait_mm           ) \
+        CDSSTRESS_Queue_F( test_fixture, FCDequeL_elimination       ) \
+        CDSSTRESS_Queue_F( test_fixture, FCDequeL_boost             ) \
+        CDSSTRESS_Queue_F( test_fixture, FCDequeL_boost_elimination ) \
+        CDSSTRESS_Queue_F( test_fixture, FCDequeR_wait_ss           ) \
+        CDSSTRESS_Queue_F( test_fixture, FCDequeR_wait_sm           ) \
+        CDSSTRESS_Queue_F( test_fixture, FCDequeR_wait_mm           ) \
+        CDSSTRESS_Queue_F( test_fixture, FCDequeR_elimination       ) \
+        CDSSTRESS_Queue_F( test_fixture, FCDequeR_boost             ) \
+        CDSSTRESS_Queue_F( test_fixture, FCDequeR_boost_elimination ) \
+
+#   define CDSSTRESS_FCDeque_HeavyValue_1( test_fixture ) \
+        CDSSTRESS_FCQueue_F( test_fixture, FCDequeL_HeavyValue_wait_ss          ) \
+        CDSSTRESS_FCQueue_F( test_fixture, FCDequeL_HeavyValue_wait_sm          ) \
+        CDSSTRESS_FCQueue_F( test_fixture, FCDequeL_HeavyValue_wait_mm          ) \
+        CDSSTRESS_FCQueue_F( test_fixture, FCDequeL_HeavyValue_elimination      ) \
+        CDSSTRESS_FCQueue_F( test_fixture, FCDequeL_HeavyValue_boost            ) \
+        CDSSTRESS_FCQueue_F( test_fixture, FCDequeL_HeavyValue_boost_elimination) \
+        CDSSTRESS_FCQueue_F( test_fixture, FCDequeR_HeavyValue_default          ) \
+        CDSSTRESS_FCQueue_F( test_fixture, FCDequeR_HeavyValue_wait_ss          ) \
+        CDSSTRESS_FCQueue_F( test_fixture, FCDequeR_HeavyValue_wait_sm          ) \
+        CDSSTRESS_FCQueue_F( test_fixture, FCDequeR_HeavyValue_wait_mm          ) \
+        CDSSTRESS_FCQueue_F( test_fixture, FCDequeR_HeavyValue_elimination      ) \
+        CDSSTRESS_FCQueue_F( test_fixture, FCDequeR_HeavyValue_boost            ) \
+        CDSSTRESS_FCQueue_F( test_fixture, FCDequeR_HeavyValue_boost_elimination) \
+
+#   define CDSSTRESS_RWQueue_1( test_fixture ) \
+        CDSSTRESS_Queue_F( test_fixture, RWQueue_Spin_ic ) \
+
+#   define CDSSTRESS_SegmentedQueue_1( test_fixture ) \
+        CDSSTRESS_Queue_F( test_fixture, SegmentedQueue_DHP_spin_padding    ) \
+
+#   define CDSSTRESS_StdQueue_1( test_fixture ) \
+        CDSSTRESS_Queue_F( test_fixture, StdQueue_deque_Mutex   ) \
+        CDSSTRESS_Queue_F( test_fixture, StdQueue_list_Mutex    ) \
+
+#else
+#   define CDSSTRESS_MSQueue_1( test_fixture )
+#   define CDSSTRESS_MoirQueue_1( test_fixture )
+#   define CDSSTRESS_OptimsticQueue_1( test_fixture )
+#   define CDSSTRESS_BasketQueue_1( test_fixture )
+#   define CDSSTRESS_FCQueue_1( test_fixture )
+#   define CDSSTRESS_FCDeque_1( test_fixture )
+#   define CDSSTRESS_FCDeque_HeavyValue_1( test_fixture )
+#   define CDSSTRESS_RWQueue_1( test_fixture )
+#   define CDSSTRESS_SegmentedQueue_1( test_fixture )
+#   define CDSSTRESS_StdQueue_1( test_fixture )
+#endif
+
 #define CDSSTRESS_MSQueue( test_fixture ) \
-    CDSSTRESS_Queue_F( test_fixture, MSQueue_HP ) \
-    CDSSTRESS_Queue_F( test_fixture, MSQueue_HP_michaelAlloc ) \
-    CDSSTRESS_Queue_F( test_fixture, MSQueue_HP_seqcst ) \
-    CDSSTRESS_Queue_F( test_fixture, MSQueue_HP_ic ) \
-    CDSSTRESS_Queue_F( test_fixture, MSQueue_HP_stat ) \
-    CDSSTRESS_Queue_F( test_fixture, MSQueue_DHP ) \
-    CDSSTRESS_Queue_F( test_fixture, MSQueue_DHP_michaelAlloc ) \
-    CDSSTRESS_Queue_F( test_fixture, MSQueue_DHP_seqcst ) \
-    CDSSTRESS_Queue_F( test_fixture, MSQueue_DHP_ic ) \
-    CDSSTRESS_Queue_F( test_fixture, MSQueue_DHP_stat )
+    CDSSTRESS_Queue_F( test_fixture, MSQueue_HP         ) \
+    CDSSTRESS_Queue_F( test_fixture, MSQueue_DHP        ) \
+    CDSSTRESS_MSQueue_1( test_fixture )
 
 #define CDSSTRESS_MoirQueue( test_fixture ) \
-    CDSSTRESS_Queue_F( test_fixture, MoirQueue_HP ) \
-    CDSSTRESS_Queue_F( test_fixture, MoirQueue_HP_michaelAlloc ) \
-    CDSSTRESS_Queue_F( test_fixture, MoirQueue_HP_seqcst ) \
-    CDSSTRESS_Queue_F( test_fixture, MoirQueue_HP_ic ) \
-    CDSSTRESS_Queue_F( test_fixture, MoirQueue_HP_stat ) \
-    CDSSTRESS_Queue_F( test_fixture, MoirQueue_DHP ) \
-    CDSSTRESS_Queue_F( test_fixture, MoirQueue_DHP_michaelAlloc ) \
-    CDSSTRESS_Queue_F( test_fixture, MoirQueue_DHP_seqcst ) \
-    CDSSTRESS_Queue_F( test_fixture, MoirQueue_DHP_ic ) \
-    CDSSTRESS_Queue_F( test_fixture, MoirQueue_DHP_stat )
+    CDSSTRESS_Queue_F( test_fixture, MoirQueue_HP       ) \
+    CDSSTRESS_Queue_F( test_fixture, MoirQueue_DHP      ) \
+    CDSSTRESS_MoirQueue_1( test_fixture )
 
 #define CDSSTRESS_OptimsticQueue( test_fixture ) \
-    CDSSTRESS_Queue_F( test_fixture, OptimisticQueue_HP ) \
-    CDSSTRESS_Queue_F( test_fixture, OptimisticQueue_HP_michaelAlloc ) \
-    CDSSTRESS_Queue_F( test_fixture, OptimisticQueue_HP_seqcst ) \
-    CDSSTRESS_Queue_F( test_fixture, OptimisticQueue_HP_ic ) \
-    CDSSTRESS_Queue_F( test_fixture, OptimisticQueue_HP_stat ) \
-    CDSSTRESS_Queue_F( test_fixture, OptimisticQueue_DHP ) \
-    CDSSTRESS_Queue_F( test_fixture, OptimisticQueue_DHP_michaelAlloc ) \
-    CDSSTRESS_Queue_F( test_fixture, OptimisticQueue_DHP_seqcst ) \
-    CDSSTRESS_Queue_F( test_fixture, OptimisticQueue_DHP_ic ) \
-    CDSSTRESS_Queue_F( test_fixture, OptimisticQueue_DHP_stat )
+    CDSSTRESS_Queue_F( test_fixture, OptimisticQueue_HP         ) \
+    CDSSTRESS_Queue_F( test_fixture, OptimisticQueue_DHP        ) \
+    CDSSTRESS_OptimsticQueue_1( test_fixture )
 
 #define CDSSTRESS_BasketQueue( test_fixture ) \
-    CDSSTRESS_Queue_F( test_fixture, BasketQueue_HP ) \
-    CDSSTRESS_Queue_F( test_fixture, BasketQueue_HP_michaelAlloc ) \
-    CDSSTRESS_Queue_F( test_fixture, BasketQueue_HP_seqcst ) \
-    CDSSTRESS_Queue_F( test_fixture, BasketQueue_HP_ic ) \
-    CDSSTRESS_Queue_F( test_fixture, BasketQueue_HP_stat ) \
-    CDSSTRESS_Queue_F( test_fixture, BasketQueue_DHP ) \
-    CDSSTRESS_Queue_F( test_fixture, BasketQueue_DHP_michaelAlloc ) \
-    CDSSTRESS_Queue_F( test_fixture, BasketQueue_DHP_seqcst ) \
-    CDSSTRESS_Queue_F( test_fixture, BasketQueue_DHP_ic ) \
-    CDSSTRESS_Queue_F( test_fixture, BasketQueue_DHP_stat )
+    CDSSTRESS_Queue_F( test_fixture, BasketQueue_HP         ) \
+    CDSSTRESS_Queue_F( test_fixture, BasketQueue_DHP        ) \
+    CDSSTRESS_BasketQueue_1( test_fixture )
 
 #define CDSSTRESS_FCQueue( test_fixture ) \
-    CDSSTRESS_Queue_F( test_fixture, FCQueue_deque ) \
-    CDSSTRESS_Queue_F( test_fixture, FCQueue_deque_elimination ) \
-    CDSSTRESS_Queue_F( test_fixture, FCQueue_deque_elimination_stat ) \
-    CDSSTRESS_Queue_F( test_fixture, FCQueue_list ) \
-    CDSSTRESS_Queue_F( test_fixture, FCQueue_list_elimination ) \
-    CDSSTRESS_Queue_F( test_fixture, FCQueue_list_elimination_stat )
+    CDSSTRESS_Queue_F( test_fixture, FCQueue_deque              ) \
+    CDSSTRESS_Queue_F( test_fixture, FCQueue_list               ) \
+    CDSSTRESS_FCQueue_1( test_fixture )
+
 
 #define CDSSTRESS_FCDeque( test_fixture ) \
-    CDSSTRESS_Queue_F( test_fixture, FCDequeL_default ) \
-    CDSSTRESS_Queue_F( test_fixture, FCDequeL_mutex ) \
-    CDSSTRESS_Queue_F( test_fixture, FCDequeL_stat ) \
-    CDSSTRESS_Queue_F( test_fixture, FCDequeL_elimination ) \
-    CDSSTRESS_Queue_F( test_fixture, FCDequeL_elimination_stat ) \
-    CDSSTRESS_Queue_F( test_fixture, FCDequeL_boost ) \
-    CDSSTRESS_Queue_F( test_fixture, FCDequeL_boost_stat ) \
-    CDSSTRESS_Queue_F( test_fixture, FCDequeL_boost_elimination ) \
-    CDSSTRESS_Queue_F( test_fixture, FCDequeL_boost_elimination_stat ) \
-    CDSSTRESS_Queue_F( test_fixture, FCDequeR_default ) \
-    CDSSTRESS_Queue_F( test_fixture, FCDequeR_mutex ) \
-    CDSSTRESS_Queue_F( test_fixture, FCDequeR_stat ) \
-    CDSSTRESS_Queue_F( test_fixture, FCDequeR_elimination ) \
-    CDSSTRESS_Queue_F( test_fixture, FCDequeR_elimination_stat ) \
-    CDSSTRESS_Queue_F( test_fixture, FCDequeR_boost ) \
-    CDSSTRESS_Queue_F( test_fixture, FCDequeR_boost_stat ) \
-    CDSSTRESS_Queue_F( test_fixture, FCDequeR_boost_elimination ) \
-    CDSSTRESS_Queue_F( test_fixture, FCDequeR_boost_elimination_stat )
+    CDSSTRESS_Queue_F( test_fixture, FCDequeL_default           ) \
+    CDSSTRESS_Queue_F( test_fixture, FCDequeR_default           ) \
+    CDSSTRESS_FCDeque_1( test_fixture )
+
+#define CDSSTRESS_FCDeque_HeavyValue( test_fixture ) \
+    CDSSTRESS_FCQueue_F( test_fixture, FCDequeL_HeavyValue_default  ) \
+    CDSSTRESS_FCDeque_HeavyValue_1( test_fixture )
 
 #define CDSSTRESS_RWQueue( test_fixture ) \
-    CDSSTRESS_Queue_F( test_fixture, RWQueue_Spin ) \
-    CDSSTRESS_Queue_F( test_fixture, RWQueue_Spin_ic ) \
-    CDSSTRESS_Queue_F( test_fixture, RWQueue_mutex )
+    CDSSTRESS_Queue_F( test_fixture, RWQueue_Spin   ) \
+    CDSSTRESS_RWQueue_1( test_fixture )
 
 #define CDSSTRESS_SegmentedQueue( test_fixture ) \
-    CDSSTRESS_Queue_F( test_fixture, SegmentedQueue_HP_spin ) \
+    CDSSTRESS_Queue_F( test_fixture, SegmentedQueue_HP_spin         ) \
     CDSSTRESS_Queue_F( test_fixture, SegmentedQueue_HP_spin_padding ) \
-    CDSSTRESS_Queue_F( test_fixture, SegmentedQueue_HP_spin_stat ) \
-    CDSSTRESS_Queue_F( test_fixture, SegmentedQueue_HP_mutex ) \
-    CDSSTRESS_Queue_F( test_fixture, SegmentedQueue_HP_mutex_padding ) \
-    CDSSTRESS_Queue_F( test_fixture, SegmentedQueue_HP_mutex_stat ) \
-    CDSSTRESS_Queue_F( test_fixture, SegmentedQueue_DHP_spin ) \
-    CDSSTRESS_Queue_F( test_fixture, SegmentedQueue_DHP_spin_padding ) \
-    CDSSTRESS_Queue_F( test_fixture, SegmentedQueue_DHP_spin_stat ) \
-    CDSSTRESS_Queue_F( test_fixture, SegmentedQueue_DHP_mutex ) \
-    CDSSTRESS_Queue_F( test_fixture, SegmentedQueue_DHP_mutex_padding ) \
-    CDSSTRESS_Queue_F( test_fixture, SegmentedQueue_DHP_mutex_stat )
-
-
-#define CDSSTRESS_TsigasQueue( test_fixture ) \
-    CDSSTRESS_Queue_F( test_fixture, TsigasCycleQueue_dyn ) \
-    CDSSTRESS_Queue_F( test_fixture, TsigasCycleQueue_dyn_michaelAlloc ) \
-    CDSSTRESS_Queue_F( test_fixture, TsigasCycleQueue_dyn_ic )
+    CDSSTRESS_Queue_F( test_fixture, SegmentedQueue_DHP_spin        ) \
+    CDSSTRESS_SegmentedQueue_1( test_fixture )
 
 #define CDSSTRESS_VyukovQueue( test_fixture ) \
-    CDSSTRESS_Queue_F( test_fixture, VyukovMPMCCycleQueue_dyn ) \
-    CDSSTRESS_Queue_F( test_fixture, VyukovMPMCCycleQueue_dyn_michaelAlloc ) \
-    CDSSTRESS_Queue_F( test_fixture, VyukovMPMCCycleQueue_dyn_ic )
+    CDSSTRESS_Queue_F( test_fixture, VyukovMPMCCycleQueue_dyn       ) \
+    CDSSTRESS_Queue_F( test_fixture, VyukovMPMCCycleQueue_dyn_ic    )
+
+#define CDSSTRESS_VyukovSingleConsumerQueue( test_fixture ) \
+    CDSSTRESS_Queue_F( test_fixture, VyukovMPSCCycleQueue_dyn       ) \
+    CDSSTRESS_Queue_F( test_fixture, VyukovMPSCCycleQueue_dyn_ic    )
+
+#define CDSSTRESS_WeakRingBuffer( test_fixture ) \
+    CDSSTRESS_Queue_F( test_fixture, WeakRingBuffer_dyn       )
+
+#define CDSSTRESS_WeakRingBuffer_void( test_fixture ) \
+    CDSSTRESS_Queue_F( test_fixture, WeakRingBuffer_void_dyn       )
 
 #define CDSSTRESS_StdQueue( test_fixture ) \
     CDSSTRESS_Queue_F( test_fixture, StdQueue_deque_Spinlock ) \
-    CDSSTRESS_Queue_F( test_fixture, StdQueue_list_Spinlock ) \
-    CDSSTRESS_Queue_F( test_fixture, StdQueue_deque_Mutex ) \
-    CDSSTRESS_Queue_F( test_fixture, StdQueue_list_Mutex )
+    CDSSTRESS_Queue_F( test_fixture, StdQueue_list_Spinlock  ) \
+    CDSSTRESS_StdQueue_1( test_fixture ) \
 
 #endif // #ifndef CDSSTRESS_QUEUE_TYPES_H