FCDeque refactoring

diff --git a/cds/container/fcdeque.h b/cds/container/fcdeque.h
index 0d1d9c2a984f6b43f87c7de907dc6affd2bda754..b84839809fe322103b6d235c8d5e75b591d967e6 100644 (file)
--- a/cds/container/fcdeque.h
+++ b/cds/container/fcdeque.h
@@ -57,18 +57,17 @@ namespace cds { namespace container {
         };
 
         /// FCDeque type traits
-        struct type_traits: public cds::algo::flat_combining::type_traits
+        struct traits: public cds::algo::flat_combining::type_traits
         {
             typedef empty_stat      stat;   ///< Internal statistics
-            static CDS_CONSTEXPR_CONST bool enable_elimination = false; ///< Enable \ref cds_elimination_description "elimination"
+            static CDS_CONSTEXPR const bool enable_elimination = false; ///< Enable \ref cds_elimination_description "elimination"
         };
 
         /// Metafunction converting option list to traits
         /**
-            This is a wrapper for <tt> cds::opt::make_options< type_traits, Options...> </tt>
             \p Options are:
             - \p opt::lock_type - mutex type, default is \p cds::lock::Spin
-            - \p opt::back_off - back-off strategy, defalt is \p cds::backoff::Default
+            - \p opt::back_off - back-off strategy, defalt is \p cds::backoff::delay_of<2>
             - \p opt::allocator - allocator type, default is \ref CDS_DEFAULT_ALLOCATOR
             - \p opt::stat - internal statistics, possible type: \ref stat, \ref empty_stat (the default)
             - \p opt::memory_model - C++ memory ordering model.
@@ -84,7 +83,7 @@ namespace cds { namespace container {
             typedef implementation_defined type ;   ///< Metafunction result
 #   else
             typedef typename cds::opt::make_options<
-                typename cds::opt::find_type_traits< type_traits, Options... >::type
+                typename cds::opt::find_type_traits< traits, Options... >::type
                 ,Options...
             >::type   type;
 #   endif
@@ -104,12 +103,12 @@ namespace cds { namespace container {
         - \p T - a value type stored in the deque
         - \p Deque - sequential deque implementation, for example, \p std::deque<T> (the default)
             or \p boost::container::deque
-        - \p Trats - type traits of flat combining, default is \p fcdeque::type_traits.
-            \p fcdeque::make_traits metafunction can be used to construct specialized \p %type_traits
+        - \p Trats - type traits of flat combining, default is \p fcdeque::traits.
+            \p fcdeque::make_traits metafunction can be used to construct specialized \p %fcdeque::traits
     */
     template <typename T,
         class Deque = std::deque<T>,
-        typename Traits = fcdeque::type_traits
+        typename Traits = fcdeque::traits
     >
     class FCDeque
 #ifndef CDS_DOXYGEN_INVOKED
@@ -119,10 +118,10 @@ namespace cds { namespace container {
     public:
         typedef T           value_type;     ///< Value type
         typedef Deque       deque_type;     ///< Sequential deque class
-        typedef Traits      type_traits;    ///< Deque type traits
+        typedef Traits      traits;         ///< Deque type traits
 
-        typedef typename type_traits::stat  stat;   ///< Internal statistics type
-        static CDS_CONSTEXPR_CONST bool c_bEliminationEnabled = type_traits::enable_elimination; ///< \p true if elimination is enabled
+        typedef typename traits::stat  stat;   ///< Internal statistics type
+        static CDS_CONSTEXPR_CONST bool c_bEliminationEnabled = traits::enable_elimination; ///< \p true if elimination is enabled
 
     protected:
         //@cond
@@ -149,7 +148,7 @@ namespace cds { namespace container {
         //@endcond
 
         /// Flat combining kernel
-        typedef cds::algo::flat_combining::kernel< fc_record, type_traits > fc_kernel;
+        typedef cds::algo::flat_combining::kernel< fc_record, traits > fc_kernel;
 
     protected:
         //@cond

diff --git a/tests/test-hdr/deque/hdr_fcdeque.cpp b/tests/test-hdr/deque/hdr_fcdeque.cpp
index 8d6042c3465421056f7d4a4b5e1ecbb1ddd749a3..91caa6e8f55dbe0bc2a77af3d2d448e00c348f16 100644 (file)
--- a/tests/test-hdr/deque/hdr_fcdeque.cpp
+++ b/tests/test-hdr/deque/hdr_fcdeque.cpp
@@ -112,12 +112,12 @@ namespace deque {
 
         void fcDeque_mutex()
         {
-            typedef cds::container::FCDeque<int, std::deque<int>,
-                cds::container::fcdeque::make_traits<
-                    cds::opt::enable_elimination< true >
-                    ,cds::opt::lock_type< std::mutex >
-                >::type
-            > deque_type;
+            struct deque_traits : public cds::container::fcdeque::traits
+            {
+                static CDS_CONSTEXPR const bool enable_elimination = true;
+                typedef std::mutex lock_type;
+            };
+            typedef cds::container::FCDeque<int, std::deque<int>, deque_traits > deque_type;
             test<deque_type>();
         }
 

diff --git a/tests/unit/queue/queue_type.h b/tests/unit/queue/queue_type.h
index 9fa554f66d263f0c555ed9b8f0b03139b2ebea32..2c98a4ef618111ff26794477a1e7ae667f723b31 100644 (file)
--- a/tests/unit/queue/queue_type.h
+++ b/tests/unit/queue/queue_type.h
@@ -27,7 +27,7 @@
 
 namespace queue {
     namespace details {
-        template <typename T, typename Traits=cds::container::fcdeque::type_traits, class Deque=std::deque<T> >
+        template <typename T, typename Traits=cds::container::fcdeque::traits, class Deque=std::deque<T> >
         class FCDequeL: public cds::container::FCDeque<T, Deque, Traits >
         {
             typedef cds::container::FCDeque<T, Deque, Traits > base_class;
@@ -61,7 +61,7 @@ namespace queue {
             }
         };
 
-        template <typename T, typename Traits=cds::container::fcdeque::type_traits, class Deque = std::deque<T> >
+        template <typename T, typename Traits=cds::container::fcdeque::traits, class Deque = std::deque<T> >
         class FCDequeR: public cds::container::FCDeque<T, Deque, Traits >
         {
             typedef cds::container::FCDeque<T, Deque, Traits > base_class;
@@ -437,7 +437,7 @@ namespace queue {
         typedef details::FCDequeL< Value, traits_FCDeque_elimination > FCDequeL_elimination;
         typedef details::FCDequeL< Value, traits_FCDeque_elimination_stat > FCDequeL_elimination_stat;
 
-        typedef details::FCDequeL< Value, cds::container::fcdeque::type_traits, boost::container::deque<Value> > FCDequeL_boost;
+        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;
@@ -448,7 +448,7 @@ namespace queue {
         typedef details::FCDequeR< Value, traits_FCDeque_elimination > FCDequeR_elimination;
         typedef details::FCDequeR< Value, traits_FCDeque_elimination_stat > FCDequeR_elimination_stat;
 
-        typedef details::FCDequeR< Value, cds::container::fcdeque::type_traits, boost::container::deque<Value> > FCDequeR_boost;
+        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;