FCQueue refactoring

diff --git a/cds/container/fcqueue.h b/cds/container/fcqueue.h
index b94a3a7ead284a106caa6c96ee1da0aa49435e8e..78a37877a18045395b2ddf9239f924969561f95f 100644 (file)
--- a/cds/container/fcqueue.h
+++ b/cds/container/fcqueue.h
@@ -47,7 +47,7 @@ namespace cds { namespace container {
         };
 
         /// FCQueue 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"
@@ -55,15 +55,14 @@ namespace cds { namespace container {
 
         /// 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::stat - internal statistics, possible type: \p fcqueue::stat, \p fcqueue::empty_stat (the default)
             - \p opt::memory_model - C++ memory ordering model.
-                List of all available memory ordering see opt::memory_model.
-                Default if cds::opt::v:relaxed_ordering
+                List of all available memory ordering see \p opt::memory_model.
+                Default is \p cds::opt::v:relaxed_ordering
             - \p opt::enable_elimination - enable/disable operation \ref cds_elimination_description "elimination"
                 By default, the elimination is disabled. For queue, the elimination is possible if the queue
                 is empty.
@@ -74,7 +73,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
@@ -93,12 +92,12 @@ namespace cds { namespace container {
         Template parameters:
         - \p T - a value type stored in the queue
         - \p Queue - sequential queue implementation, default is \p std::queue<T>
-        - \p Trats - type traits of flat combining, default is \p fcqueue::type_traits.
-            \p fcqueue::make_traits metafunction can be used to construct specialized \p %type_traits
+        - \p Trats - type traits of flat combining, default is \p fcqueue::traits.
+            \p fcqueue::make_traits metafunction can be used to construct \p %fcqueue::traits specialization.
     */
     template <typename T,
         class Queue = std::queue<T>,
-        typename Traits = fcqueue::type_traits
+        typename Traits = fcqueue::traits
     >
     class FCQueue
 #ifndef CDS_DOXYGEN_INVOKED
@@ -108,10 +107,10 @@ namespace cds { namespace container {
     public:
         typedef T           value_type;     ///< Value type
         typedef Queue       queue_type;     ///< Sequential queue class
-        typedef Traits      type_traits;    ///< Queue type traits
+        typedef Traits      traits;         ///< Queue 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
@@ -135,7 +134,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/cds/intrusive/fcqueue.h b/cds/intrusive/fcqueue.h
index 7fafe1d81243cc09726b1335a0806f4097d40181..366535d4de9d3a1f6d4407492d09bb854faf0c1e 100644 (file)
--- a/cds/intrusive/fcqueue.h
+++ b/cds/intrusive/fcqueue.h
@@ -43,7 +43,7 @@ namespace cds { namespace intrusive {
         };
 
         /// FCQueue type traits
-        struct type_traits: public cds::algo::flat_combining::type_traits
+        struct traits: public cds::algo::flat_combining::type_traits
         {
             typedef cds::intrusive::opt::v::empty_disposer  disposer ; ///< Disposer to erase removed elements. Used only in \p FCQueue::clear() function
             typedef empty_stat      stat;   ///< Internal statistics
@@ -52,17 +52,16 @@ namespace cds { namespace intrusive {
 
         /// 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::disposer - the functor used for dispose removed items. Default is opt::intrusive::v::empty_disposer.
+            - \p opt::disposer - the functor used for dispose removed items. Default is \p opt::intrusive::v::empty_disposer.
                 This option is used only in \p FCQueue::clear() function.
             - \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::stat - internal statistics, possible type: \p fcqueue::stat, \p fcqueue::empty_stat (the default)
             - \p opt::memory_model - C++ memory ordering model.
-                List of all available memory ordering see opt::memory_model.
-                Default if cds::opt::v:relaxed_ordering
+                List of all available memory ordering see \p opt::memory_model.
+                Default is \p cds::opt::v:relaxed_ordering
             - \p opt::enable_elimination - enable/disable operation \ref cds_elimination_description "elimination"
                 By default, the elimination is disabled.
         */
@@ -72,7 +71,7 @@ namespace cds { namespace intrusive {
             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
@@ -90,12 +89,12 @@ namespace cds { namespace intrusive {
         - \p T - a value type stored in the queue
         - \p Container - sequential intrusive container with \p push_back and \p pop_front functions.
             Default is \p boost::intrusive::list
-        - \p Traits - type traits of flat combining, default is \p fcqueue::type_traits.
-            \p fcqueue::make_traits metafunction can be used to construct specialized \p %type_traits
+        - \p Traits - type traits of flat combining, default is \p fcqueue::traits.
+            \p fcqueue::make_traits metafunction can be used to construct \p %fcqueue::traits specialization
     */
     template <typename T
         ,class Container = boost::intrusive::list<T>
-        ,typename Traits = fcqueue::type_traits
+        ,typename Traits = fcqueue::traits
     >
     class FCQueue
 #ifndef CDS_DOXYGEN_INVOKED
@@ -105,11 +104,11 @@ namespace cds { namespace intrusive {
     public:
         typedef T           value_type;     ///< Value type
         typedef Container   container_type; ///< Sequential container type
-        typedef Traits      type_traits;    ///< Queue type traits
+        typedef Traits      traits;         ///< Queue traits
 
-        typedef typename type_traits::disposer  disposer;   ///< The disposer functor. The disposer is used only in \ref clear() function
-        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::disposer   disposer;   ///< The disposer functor. The disposer is used only in \ref clear() function
+        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
@@ -130,7 +129,7 @@ namespace cds { namespace intrusive {
         //@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/queue/hdr_fcqueue.cpp b/tests/test-hdr/queue/hdr_fcqueue.cpp
index 4f00f9aea93887f5068a0bc84d1ad585f01d85d2..096b7d148a64676017a3ba2535fd704db294340c 100644 (file)
--- a/tests/test-hdr/queue/hdr_fcqueue.cpp
+++ b/tests/test-hdr/queue/hdr_fcqueue.cpp
@@ -72,11 +72,11 @@ namespace queue {
 
     void Queue_TestHeader::FCQueue_list_stat()
     {
-        typedef cds::container::FCQueue<int, std::queue< int, std::list<int> >,
-            cds::container::fcqueue::make_traits<
-            cds::opt::stat< cds::container::fcqueue::stat<> >
-            >::type
-        > queue_type;
+        struct queue_traits : public cds::container::fcqueue::traits 
+        {
+            typedef cds::container::fcqueue::stat<> stat;
+        };
+        typedef cds::container::FCQueue<int, std::queue< int, std::list<int> >, queue_traits > queue_type;
         testFCQueue<queue_type>();
     }
 

diff --git a/tests/test-hdr/queue/hdr_intrusive_fcqueue.cpp b/tests/test-hdr/queue/hdr_intrusive_fcqueue.cpp
index 54d67d7ff2955e5562cc5223eaf89320ab253b41..9d9725ffdfa010fb224a9edfbd2005507a016e46 100644 (file)
--- a/tests/test-hdr/queue/hdr_intrusive_fcqueue.cpp
+++ b/tests/test-hdr/queue/hdr_intrusive_fcqueue.cpp
@@ -168,12 +168,12 @@ namespace queue {
     void TestIntrusiveFCQueue::FCQueue_base_stat()
     {
         typedef base_hook_item< boost::intrusive::list_base_hook<> > value_type;
-        typedef cds::intrusive::FCQueue< value_type, boost::intrusive::list< value_type >,
-            cds::intrusive::fcqueue::make_traits<
-                cds::intrusive::opt::disposer< disposer >
-                ,cds::opt::stat< cds::intrusive::fcqueue::stat<> >
-            >::type
-        > queue_type;
+        struct queue_traits : public cds::intrusive::fcqueue::traits
+        {
+            typedef TestIntrusiveFCQueue::disposer disposer;
+            typedef cds::intrusive::fcqueue::stat<> stat;
+        };
+        typedef cds::intrusive::FCQueue< value_type, boost::intrusive::list< value_type >, queue_traits > queue_type;
 
         test<queue_type>();
     }
@@ -181,12 +181,13 @@ namespace queue {
     void TestIntrusiveFCQueue::FCQueue_base_elimination()
     {
         typedef base_hook_item< boost::intrusive::list_base_hook<> > value_type;
-        typedef cds::intrusive::FCQueue< value_type, boost::intrusive::list< value_type >,
-            cds::intrusive::fcqueue::make_traits<
+        struct queue_traits : public
+            cds::intrusive::fcqueue::make_traits <
                 cds::intrusive::opt::disposer< disposer >
-                ,cds::opt::enable_elimination< true >
-            >::type
-        > queue_type;
+                ,cds::opt::enable_elimination < true >
+            > ::type
+        {};
+        typedef cds::intrusive::FCQueue< value_type, boost::intrusive::list< value_type >, queue_traits > queue_type;
 
         test<queue_type>();
     }