From 48ab9cea6325169479ae8b473a579afb4ef7805b Mon Sep 17 00:00:00 2001 From: khizmax Date: Thu, 9 Oct 2014 13:10:31 +0400 Subject: [PATCH] FCDeque refactoring --- cds/container/fcdeque.h | 23 +++++++++++------------ tests/test-hdr/deque/hdr_fcdeque.cpp | 12 ++++++------ tests/unit/queue/queue_type.h | 8 ++++---- 3 files changed, 21 insertions(+), 22 deletions(-) diff --git a/cds/container/fcdeque.h b/cds/container/fcdeque.h index 0d1d9c2a..b8483980 100644 --- 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 cds::opt::make_options< type_traits, Options...> \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 (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 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 8d6042c3..91caa6e8 100644 --- 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, - 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, deque_traits > deque_type; test(); } diff --git a/tests/unit/queue/queue_type.h b/tests/unit/queue/queue_type.h index 9fa554f6..2c98a4ef 100644 --- a/tests/unit/queue/queue_type.h +++ b/tests/unit/queue/queue_type.h @@ -27,7 +27,7 @@ namespace queue { namespace details { - template > + template > class FCDequeL: public cds::container::FCDeque { typedef cds::container::FCDeque base_class; @@ -61,7 +61,7 @@ namespace queue { } }; - template > + template > class FCDequeR: public cds::container::FCDeque { typedef cds::container::FCDeque 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 > FCDequeL_boost; + typedef details::FCDequeL< Value, cds::container::fcdeque::traits, boost::container::deque > FCDequeL_boost; typedef details::FCDequeL< Value, traits_FCDeque_stat, boost::container::deque > FCDequeL_boost_stat; typedef details::FCDequeL< Value, traits_FCDeque_elimination, boost::container::deque > FCDequeL_boost_elimination; typedef details::FCDequeL< Value, traits_FCDeque_elimination_stat, boost::container::deque > 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 > FCDequeR_boost; + typedef details::FCDequeR< Value, cds::container::fcdeque::traits, boost::container::deque > FCDequeR_boost; typedef details::FCDequeR< Value, traits_FCDeque_stat, boost::container::deque > FCDequeR_boost_stat; typedef details::FCDequeR< Value, traits_FCDeque_elimination, boost::container::deque > FCDequeR_boost_elimination; typedef details::FCDequeR< Value, traits_FCDeque_elimination_stat, boost::container::deque > FCDequeR_boost_elimination_stat; -- 2.34.1